From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2013 15:59:18 +0000 (-0700)
Subject: Merge branch 'sr/am-show-final-message-in-applying-indicator'
X-Git-Tag: v1.8.3-rc0~150
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f161fb041eb682af8bae56f31f75bf0065557b95?hp=0cb24fe86eea8bbbc7f33ede78ccf3113cd7b8c3

Merge branch 'sr/am-show-final-message-in-applying-indicator'

In addition to the case where the user edits the log message with
the "e)dit" option of "am -i", replace the "Applying: this patch"
message with the final log message contents after applymsg hook
munges it.

* sr/am-show-final-message-in-applying-indicator:
git-am: show the final log message on "Applying:" indicator
---

diff --git a/git-am.sh b/git-am.sh
index 202130f888..c092855dd7 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -778,13 +778,6 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
 	    action=yes
 	fi
 
-	if test -f "$dotest/final-commit"
-	then
-		FIRSTLINE=$(sed 1q "$dotest/final-commit")
-	else
-		FIRSTLINE=""
-	fi
-
 	if test $action = skip
 	then
 		go_next
@@ -797,6 +790,13 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
 		stop_here $this
 	fi
 
+	if test -f "$dotest/final-commit"
+	then
+		FIRSTLINE=$(sed 1q "$dotest/final-commit")
+	else
+		FIRSTLINE=""
+	fi
+
 	say "$(eval_gettext "Applying: \$FIRSTLINE")"
 
 	case "$resolved" in