mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-am -i: report rewritten title

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2007-12-04 23:01:30 -08:00
parent 6326cee51b
commit f23272f3fd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-am.sh
View File

@ -102,6 +102,10 @@ It does not apply to blobs recorded in its index."
unset GITHEAD_$his_tree unset GITHEAD_$his_tree
} }
reread_subject () {
git stripspace <"$1" | sed -e 1q
}
prec=4 prec=4
dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume= resolvemsg= resume=
@ -372,6 +376,7 @@ do
[aA]*) action=yes interactive= ;; [aA]*) action=yes interactive= ;;
[nN]*) action=skip ;; [nN]*) action=skip ;;
[eE]*) git_editor "$dotest/final-commit" [eE]*) git_editor "$dotest/final-commit"
SUBJECT=$(reread_subject "$dotest/final-commit")
action=again ;; action=again ;;
[vV]*) action=again [vV]*) action=again
LESS=-S ${PAGER:-less} "$dotest/patch" ;; LESS=-S ${PAGER:-less} "$dotest/patch" ;;