combine-diff: extend --cc logic to Octopus.

diff --git a/git-am.sh b/git-am.sh
index 1a114bcc0809836ed4edaa0866704b899e587cd2..731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4 100755 (executable)
--- 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
        }