Skip to content

Commit

Permalink
git-am: show the final log message on "Applying:" indicator
Browse files Browse the repository at this point in the history
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 f23272f
(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>
  • Loading branch information
rudis authored and gitster committed Mar 21, 2013
1 parent 7b9a419 commit b34a912
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions git-am.sh
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b34a912

Please sign in to comment.