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 <gitster@pobox.com>
Junio C Hamano committed
Mar 28, 2012 at 09:55 UTC
5d86861c925f15676a14b54062725eb11a85ffbc
1 file changed
+6
git-am.sh
+6
@@ -138,6 +138,12 @@ fall_back_3way () {
138
say Using index info to reconstruct a base tree...
139
140
cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
141
+
142
+ if test -z "$GIT_QUIET"
143
+ then
144
+ eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
145
+ fi
146
+
147
cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
148
if eval "$cmd"
149
then