diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-04-16 16:46:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-04-16 16:46:26 -0700 |
commit | 11dc4e70c33c2fbbff19014035d3bf624da1902c (patch) | |
tree | 1d3eb55b33a0ec02f584493aa57d171f95f14d67 | |
parent | 25dc72007706a69c700fc14fef65440b250bf564 (diff) | |
download | git-11dc4e70c33c2fbbff19014035d3bf624da1902c.tar.gz git-11dc4e70c33c2fbbff19014035d3bf624da1902c.tar.xz |
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>
-rwxr-xr-x | git-am.sh | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -355,7 +355,6 @@ do ;; esac esac - FIRSTLINE=$(head -1 "$dotest/final-commit") resume= if test "$interactive" = t @@ -376,7 +375,6 @@ do [aA]*) action=yes interactive= ;; [nN]*) action=skip ;; [eE]*) git_editor "$dotest/final-commit" - FIRSTLINE=$(head -1 "$dotest/final-commit") action=again ;; [vV]*) action=again LESS=-S ${PAGER:-less} "$dotest/patch" ;; @@ -386,6 +384,7 @@ do else action=yes fi + FIRSTLINE=$(head -1 "$dotest/final-commit") if test $action = skip then |