git-am: minor cleanup
This moves the assignment to FIRSTLINE down so that we do not have to have multiple copies. Suggested by Linus. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
25dc720077
commit
11dc4e70c3
@ -355,7 +355,6 @@ do
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
esac
|
esac
|
||||||
FIRSTLINE=$(head -1 "$dotest/final-commit")
|
|
||||||
|
|
||||||
resume=
|
resume=
|
||||||
if test "$interactive" = t
|
if test "$interactive" = t
|
||||||
@ -376,7 +375,6 @@ 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"
|
||||||
FIRSTLINE=$(head -1 "$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" ;;
|
||||||
@ -386,6 +384,7 @@ do
|
|||||||
else
|
else
|
||||||
action=yes
|
action=yes
|
||||||
fi
|
fi
|
||||||
|
FIRSTLINE=$(head -1 "$dotest/final-commit")
|
||||||
|
|
||||||
if test $action = skip
|
if test $action = skip
|
||||||
then
|
then
|
||||||
|
Loading…
Reference in New Issue
Block a user