From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 5 May 2005 23:07:56 +0000 (-0700)
Subject: Fix git-resolve-script.
X-Git-Tag: v0.99~637
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5a72fd622ecedaea272cd6292abb7138a49e460;p=git.git

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.
---

diff --git a/git-resolve-script b/git-resolve-script
index c04c0307b..c2f7a6e24 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