1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
git/git-commit-script
Linus Torvalds 9c065315f7 Make "git commit" work correctly in the presense of a manual merge
This has gotten only very light testing, but something like this is
clearly necessary and did the right thing for the one case I threw at
it.
2005-06-08 13:33:15 -07:00

24 lines
640 B
Bash
Executable file

#!/bin/sh
: ${GIT_DIR=.git}
PARENTS="HEAD"
if [ -f $GIT_DIR/MERGE_HEAD ]; then
echo "#"
echo "# It looks like your may be committing a MERGE."
echo "# If this is not correct, please remove the file"
echo "# $GIT_DIR/MERGE_HEAD"
echo "# and try again"
echo "#"
PARENTS="HEAD -p MERGE_HEAD"
fi > .editmsg
git-status-script >> .editmsg
if [ "$?" != "0" ]
then
cat .editmsg
exit 1
fi
${VISUAL:-${EDITOR:-vi}} .editmsg
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
[ -s .cmitmsg ] || exit 1
tree=$(git-write-tree) || exit 1
commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
echo $commit > ${GIT_DIR:-.git}/HEAD