From 5d86861c925f15676a14b54062725eb11a85ffbc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Mar 2012 09:55:21 -0700 Subject: [PATCH] am -3: list the paths that needed 3-way fallback When applying a patch that was based on an older release with "am -3", I often wonder changes to which files need to be reviewed with extra care to spot mismerges, but there is no good indication. The paths that needed 3-way fallback can easily be obtained by comparing the synthesized (partial) base tree and the current HEAD and noticing only additions and modifications (removals only show the sparseness of the fake ancestor tree, which is not useful information at all). List them in the usual --name-status format. Signed-off-by: Junio C Hamano --- git-am.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git-am.sh b/git-am.sh index 4da0ddafc..e686a1759 100755 --- a/git-am.sh +++ b/git-am.sh @@ -138,6 +138,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 -- 2.26.2