summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-04 23:01:30 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-05 16:27:17 -0800
commitf23272f3fd84fd37d97917f37233fbf01deb32b4 (patch)
tree8d0982e61a984cb8789e729ac625c66f27c0474c /git-am.sh
parent6326cee51b21d67e1335ead285cb52b83234b2b4 (diff)
downloadgit-f23272f3fd84fd37d97917f37233fbf01deb32b4.tar.gz
git-am -i: report rewritten title
Jeff Garzik noticed that "git am -i" reports the applied patch with the title before the user edited it. This was confusing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 5792631d84..44c558c940 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -102,6 +102,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=
@@ -372,6 +376,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" ;;