From 73319032c8d2b2c73138d5caee1d2838fe1305d2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Oct 2005 11:46:43 -0700 Subject: [PATCH] git-am: do not fail if 3-way fallback succeeds. The current one incorrectly stops there without committing. Signed-off-by: Junio C Hamano --- git-am.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/git-am.sh b/git-am.sh index 85d682669c..c562159a18 100755 --- a/git-am.sh +++ b/git-am.sh @@ -296,15 +296,19 @@ do git-apply --index "$dotest/patch"; apply_status=$? if test $apply_status = 1 && test "$threeway" = t then - (fall_back_3way) || stop_here $this - - # Applying the patch to an earlier tree and merging the - # result may have produced the same tree as ours. - if test '' = "$(git-diff-index --cached --name-only -z HEAD)" + if (fall_back_3way) then - echo No changes -- Patch already applied. - go_next - continue + # Applying the patch to an earlier tree and merging the + # result may have produced the same tree as ours. + changed="$(git-diff-index --cached --name-only -z HEAD)" + if test '' = "$changed" + then + echo No changes -- Patch already applied. + go_next + continue + fi + # clear apply_status -- we have successfully merged. + apply_status=0 fi fi if test $apply_status != 0 -- 2.11.4.GIT