Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'jc/am-report-3way'

When "git am -3" needs to fall back to an application to a synthesized
preimage followed by a 3-way merge, the paths that needed such treatment
are now reported to the end user, so that the result in them can be
eyeballed with extra care.

* jc/am-report-3way:
  am -3: list the paths that needed 3-way fallback
  • Loading branch information...
commit bb52e7f600c9732c624ffc27f8321f55c4b4d90b 2 parents 334dde8 + 5d86861
@gitster gitster authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 git-am.sh
View
6 git-am.sh
@@ -139,6 +139,12 @@ fall_back_3way () {
say Using index info to reconstruct a base tree...
cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
+
+ if test -z "$GIT_QUIET"
+ then
+ eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
+ fi
+
cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
if eval "$cmd"
then
Please sign in to comment.
Something went wrong with that request. Please try again.