@matheusbsbs / matheus-bagliano / commits / 69224716f7
Fork 0

Fix git-am --skip

git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jan Harkes committed Dec 17, 2005 at 01:01 UTC 69224716f78d6a772318e73060a70ba5ae67e55b
1 file changed +2
git-am.sh
+2
@@ -211,6 +211,7 @@ this=`cat "$dotest/next"`
211 if test "$skip" = t
212 then
213 this=`expr "$this" + 1`
214 + resume=
215 fi
216
217 if test "$this" -gt "$last"
@@ -225,6 +226,7 @@ do
226 msgnum=`printf "%0${prec}d" $this`
227 next=`expr "$this" + 1`
228 test -f "$dotest/$msgnum" || {
229 + resume=
230 go_next
231 continue
232 }