From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 30 Nov 2005 05:06:10 +0000 (-0800)
Subject: merge-one-file: leave unmerged index entries upon automerge failure.
X-Git-Tag: v0.99.9l^2~24^5~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=354b9b59b0a02ce7e32a7b0c10caaa1e3532f22b;p=git.git

merge-one-file: leave unmerged index entries upon automerge failure.

When automerge fails, we used to collapse the path to stage0
from "our" branch, to help "diff-files" users to view the
half-merged state against the current HEAD.  Now diff-files has
been taught how to compare with unmerged stage2,leaving them
unmerged is a better thing to do, especially this prevents the
unresolved conflicts to be committed by mistake.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index c3eca8b3..739a0729 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -79,11 +79,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 		;;
 	esac
 
-	# We reset the index to the first branch, making
-	# git-diff-file useful
-	git-update-index --add --cacheinfo "$6" "$2" "$4"
-		git-checkout-index -u -f -- "$4" &&
-		merge "$4" "$orig" "$src2"
+	merge "$4" "$orig" "$src2"
 	ret=$?
 	rm -f -- "$orig" "$src2"