development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Junio C Hamano 2013-04-01 08:59:18 -07:00
commit f161fb041e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
git-am.sh
View file

@ -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