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

Fix git-resolve-script.

Browse Source 
I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.
This commit is contained in:
Linus Torvalds 2005-05-05 16:07:56 -07:00
parent db823d4a5a
commit d5a72fd622
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-resolve-script
View File

@ -49,7 +49,7 @@ if [ $? -ne 0 ]; then
merge_msg="Automatic merge of $merge_repo" merge_msg="Automatic merge of $merge_repo"
result_tree=$(git-write-tree) || exit 1 result_tree=$(git-write-tree) || exit 1
fi 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 "Committed merge $result_commit"
echo $result_commit > .git/HEAD echo $result_commit > .git/HEAD
git-checkout-cache -f -a && git-update-cache --refresh git-checkout-cache -f -a && git-update-cache --refresh