git-am: show the final log message on "Applying:" indicator
The "Applying:" message "git am" shows to tell the user which patch is being applied has traditionally been to help identifying the input, but we started showing the edited result since f23272f3fd84 (git-am -i: report rewritten title, 2007-12-04), because it was found more confusing to show the original during an interactive session. Treat the modification by the applypatch-msg hook in a similar way and use the edited result in the progress indication, even though this is usually not interactive. Signed-off-by: Simon Ruderich <simon@ruderich.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Simon Ruderich committed
Mar 21, 2013 at 03:40 UTC
b34a912989624de37f859b4d70d9eab4cfe285dd
1 file changed
+7
-7
git-am.sh
+7
-7
@@ -778,13 +778,6 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
778
action=yes
779
fi
780
781
- if test -f "$dotest/final-commit"
782
- then
783
- FIRSTLINE=$(sed 1q "$dotest/final-commit")
784
- else
785
- FIRSTLINE=""
786
- fi
787
-
781
if test $action = skip
782
then
783
go_next
@@ -797,6 +790,13 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
790
stop_here $this
791
fi
792
793
+ if test -f "$dotest/final-commit"
794
+ then
795
+ FIRSTLINE=$(sed 1q "$dotest/final-commit")
796
+ else
797
+ FIRSTLINE=""
798
+ fi
799
+
800
say "$(eval_gettext "Applying: \$FIRSTLINE")"
801
802
case "$resolved" in