summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-05 17:49:13 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-05 17:49:13 -0800
commit27ee189163070f53a87e033171a45520f70b242e (patch)
treeb1c6bba0f03a0ab8cef38f991f2af14a408599b3 /git-am.sh
parent3b78959ece0212225ae71efbdf2c1a2183e532f5 (diff)
parentf23272f3fd84fd37d97917f37233fbf01deb32b4 (diff)
downloadgit-27ee189163070f53a87e033171a45520f70b242e.tar.gz
Merge branch 'maint'
* maint: git-am -i: report rewritten title git grep shows the same hit repeatedly for unmerged paths Do check_repository_format() early (re-fix) Do check_repository_format() early Add missing inside_work_tree setting in setup_git_directory_gently
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 76c1c844a9..65c634f77a 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" ;;