From d7ebd53d371153f7a61c0fe9f384c9662b751bf6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 23 Jan 2007 16:51:22 -0800 Subject: git-checkout -m: fix merge case Commit c1a4278e switched the "merging checkout" implementation from 3-way read-tree to merge-recursive, but forgot that merge-recursive will signal an unmerged state with its own exit status code. This prevented the clean-up phase (paths cleanly merged should not be updated in the index) from running. Signed-off-by: Junio C Hamano --- git-checkout.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'git-checkout.sh') diff --git a/git-checkout.sh b/git-checkout.sh index e02d4d87f..c52f352f0 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -200,17 +200,12 @@ else # Match the index to the working tree, and do a three-way. git diff-files --name-only | git update-index --remove --stdin && work=`git write-tree` && - git read-tree --reset -u $new && - eval GITHEAD_$new=${new_name:-${branch:-$new}} GITHEAD_$work=local && - export GITHEAD_$new GITHEAD_$work && - git merge-recursive $old -- $new $work || exit + git read-tree --reset -u $new || exit - if result=`git write-tree 2>/dev/null` - then - echo >&2 "Trivially automerged." - else - git merge-index -o git-merge-one-file -a - fi + eval GITHEAD_$new=${new_name:-${branch:-$new}} && + eval GITHEAD_$work=local && + export GITHEAD_$new GITHEAD_$work && + git merge-recursive $old -- $new $work # Do not register the cleanly merged paths in the index yet. # this is not a real merge before committing, but just carrying -- cgit v1.2.1