mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
6326cee51b
commit
f23272f3fd
|
@ -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" ;;
|
||||
|
|
Loading…
Reference in a new issue