summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 23:07:56 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 23:07:56 (GMT)
commitd5a72fd622ecedaea272cd6292abb7138a49e460 (patch)
tree43f5dc2403d372cca26333cf8ed491709844db5d /git-resolve-script
parentdb823d4a5a47d614895c959dce2a379a2364b677 (diff)
downloadgit-d5a72fd622ecedaea272cd6292abb7138a49e460.zip
git-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.gz
git-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.bz2
Fix git-resolve-script.
I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.
Diffstat (limited to 'git-resolve-script')
-rw-r--r--git-resolve-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script
index c04c030..c2f7a6e 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -49,7 +49,7 @@ if [ $? -ne 0 ]; then
merge_msg="Automatic merge of $merge_repo"
result_tree=$(git-write-tree) || exit 1
fi
-result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge_head)
+result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit"
echo $result_commit > .git/HEAD
git-checkout-cache -f -a && git-update-cache --refresh