summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-04-16 16:46:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-16 16:46:26 -0700
commit11dc4e70c33c2fbbff19014035d3bf624da1902c (patch)
tree1d3eb55b33a0ec02f584493aa57d171f95f14d67
parentClarify and fix English in "git-rm" documentation (diff)
downloadtgif-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-xgit-am.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 0f05a2cfe3..6be33d9ddb 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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