undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make "git commit" work correctly in the presense of a manual merge

Browse Source 
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.
This commit is contained in:
Linus Torvalds 2005-06-08 13:33:15 -07:00
parent 3c65eb1849
commit 9c065315f7
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-commit-script
View File

@ -1,5 +1,16 @@
#!/bin/sh
git-status-script > .editmsg
: ${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
@ -9,5 +20,5 @@ ${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 HEAD) || exit 1
commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
echo $commit > ${GIT_DIR:-.git}/HEAD

3
git-resolve-script
View File

@ -57,4 +57,5 @@ fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
git-diff-tree -p $head $result_commit | git-apply --stat
rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD