summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-22 16:50:28 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-22 16:50:28 -0800
commitef88ad238779c4eadba9f179146fe213f047b89f (patch)
tree2830c1801a97e9e2c3e408ecaf7d89459c14d422 /git-am.sh
parent77e572653b5089c9e3639fe4088f59e4cfef4eea (diff)
downloadgit-ef88ad238779c4eadba9f179146fe213f047b89f.tar.gz
rebase --skip: correctly wrap-up when skipping the last patch
When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/git-am.sh b/git-am.sh
index de116a29ef..69474e5da2 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -554,13 +554,6 @@ then
resume=
fi
-if test "$this" -gt "$last"
-then
- say Nothing to do.
- rm -fr "$dotest"
- exit
-fi
-
while test "$this" -le "$last"
do
msgnum=`printf "%0${prec}d" $this`