Re: Cosmetic git-am interactive bug
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Jeff Garzik [off-list ref] writes:
The use of the older one-line summary led me to believe that it had not committed my changelog edits. Looking at the result, however, proved that the commit changelog was my new, corrected version.
I knew about this for quite some time but it was a very low priority for me. This should fix it. Signed-off-by: Junio C Hamano <redacted> ---
diff --git a/git-am.sh b/git-am.sh
index 2e40708..339d863 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -117,6 +117,10 @@ It does not apply to blobs recorded in its index." unset GITHEAD_$his_tree } +reread_subject () { + git stripspace <"$1" | sed -e 1q +} + prec=4 dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg= resume=
@@ -376,6 +380,7 @@ do [aA]*) action=yes interactive= ;; [nN]*) action=skip ;; [eE]*) git_editor "$dotest/final-commit" + SUBJECT=$(reread_subject "$dotest/final-commit") action=again ;; [vV]*) action=again LESS=-S ${PAGER:-less} "$dotest/patch" ;;