diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:07:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:07:56 -0700 |
| commit | d5a72fd622ecedaea272cd6292abb7138a49e460 (patch) | |
| tree | 43f5dc2403d372cca26333cf8ed491709844db5d | |
| parent | Fix symlink handling (diff) | |
| download | tgif-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.xz | |
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.
| -rw-r--r-- | git-resolve-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index c04c0307b2..c2f7a6e240 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 |