undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-am: show the final log message on "Applying:" indicator

Browse Source 
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 f23272f3fd
(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>
This commit is contained in:
Simon Ruderich 2013-03-21 03:40:17 +01:00 committed by Junio C Hamano
parent 7b9a41987a
commit b34a912989
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