diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:18 -0700 |
| commit | f161fb041eb682af8bae56f31f75bf0065557b95 (patch) | |
| tree | 29ea5221c212b5d26d9a013581b96b8625aa2c80 | |
| parent | 0cb24fe86eea8bbbc7f33ede78ccf3113cd7b8c3 (diff) | |
| parent | b34a912989624de37f859b4d70d9eab4cfe285dd (diff) | |
| download | git-f161fb041eb682af8bae56f31f75bf0065557b95.tar.gz | |
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
| -rwxr-xr-x | git-am.sh | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 |