summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-20 22:49:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-20 22:49:37 (GMT)
commitbb52e7f600c9732c624ffc27f8321f55c4b4d90b (patch)
tree067f898b3e11d5453db20e3b521d84711bfff93d /git-am.sh
parent334dde8532c68dfcadefbc3a7d96a499c0ec1445 (diff)
parent5d86861c925f15676a14b54062725eb11a85ffbc (diff)
downloadgit-bb52e7f600c9732c624ffc27f8321f55c4b4d90b.zip
git-bb52e7f600c9732c624ffc27f8321f55c4b4d90b.tar.gz
git-bb52e7f600c9732c624ffc27f8321f55c4b4d90b.tar.bz2
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
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 928a35f..f8b7a0c 100755
--- a/git-am.sh
+++ b/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