mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-am: do not fail if 3-way fallback succeeds.

Browse Source 
The current one incorrectly stops there without committing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-13 11:46:43 -07:00
parent 8af12741ee
commit 73319032c8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git-am.sh
View File

@ -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