Merge branch 'af/maint-install-no-handlink'

[git.git] / t / t4151-am-abort.sh

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index dda7e2c28e2be190a94868f6c73bb9a5d918f8bf..7d86cdff64522f588a3d3e781cf2b272087cfd88 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -14,9 +14,11 @@ test_expect_success setup '
        git add file-1 file-2 &&
        git commit -m initial &&
        git tag initial &&
-       for i in 2 3 4 5
+       for i in 2 3 4 5 6
        do
                echo $i >>file-1 &&
+               echo $i >otherfile-$i &&
+               git add otherfile-$i &&
                test_tick &&
                git commit -a -m $i || break
        done &&
@@ -32,7 +34,7 @@ do
                git reset --hard initial &&
                cp file-2-expect file-2 &&
 
-               test_must_fail git am$with3 000[124]-*.patch &&
+               test_must_fail git am$with3 000[1245]-*.patch &&
                git log --pretty=tformat:%s >actual &&
                for i in 3 2 initial
                do
@@ -41,6 +43,13 @@ do
                test_cmp expect actual
        '
 
+       test_expect_success "am$with3 --skip continue after failed am$with3" '
+               test_must_fail git-am$with3 --skip >output &&
+               test "$(grep "^Applying" output)" = "Applying: 6" &&
+               test_cmp file-2-expect file-2 &&
+               test ! -f .git/rr-cache/MERGE_RR
+       '
+
        test_expect_success "am --abort goes back after failed am$with3" '
                git-am --abort &&
                git rev-parse HEAD >actual &&