[PATCH] git-am: fix "Applying" message when applypatch-hook was run
From: Simon Ruderich <hidden>
Date: 2016-06-15 22:56:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- Hello, This patch fixes a minor issue with git-am. When the applypatch-hook modifies the commit message, git-am displays the original message. This patch updates the message to use the modified version. Regards Simon git-am.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/git-am.sh b/git-am.sh
index 202130f..0997077 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -795,6 +795,14 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"." then "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || stop_here $this + + # applypatch-msg can update the commit message. + if test -f "$dotest/final-commit" + then + FIRSTLINE=$(sed 1q "$dotest/final-commit") + else + FIRSTLINE="" + fi fi say "$(eval_gettext "Applying: \$FIRSTLINE")"
--
1.8.2
--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9