summaryrefslogtreecommitdiffstats
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-21 00:01:00 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-21 00:01:00 -0800
commitc2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch)
tree08ffe5b40e062d596deee47f3869278f4661a858 /git-am.sh
parentGIT 0.99.9n aka 1.0rc6 (diff)
parentMake "git-send-pack" less verbose by default (diff)
downloadgit-1.0.0.tar.gz
git-1.0.0.zip
GIT 1.0.0v1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 1a114bcc08..731ab1fffa 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -211,6 +211,7 @@ this=`cat "$dotest/next"`
if test "$skip" = t
then
this=`expr "$this" + 1`
+ resume=
fi
if test "$this" -gt "$last"
@@ -225,6 +226,7 @@ do
msgnum=`printf "%0${prec}d" $this`
next=`expr "$this" + 1`
test -f "$dotest/$msgnum" || {
+ resume=
go_next
continue
}