Merge branch 'maint'

diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 0e3ce3611d9e83ab290ce034f2439961864ce30a..32e3b0ee0b9d00516602934353d92da35e8b19f1 100755 (executable)
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -18,7 +18,7 @@ test_expect_success setup '
        cat victim >original &&
        git update-index --add victim &&
 
-       : add to the head
+       # add to the head
        for i in a b '"$L"' y
        do
                echo $i
@@ -27,7 +27,7 @@ test_expect_success setup '
        git diff victim >add-a-patch.with &&
        git diff --unified=0 >add-a-patch.without &&
 
-       : insert at line two
+       # insert at line two
        for i in b a '"$L"' y
        do
                echo $i
@@ -36,7 +36,7 @@ test_expect_success setup '
        git diff victim >insert-a-patch.with &&
        git diff --unified=0 >insert-a-patch.without &&
 
-       : modify at the head
+       # modify at the head
        for i in a '"$L"' y
        do
                echo $i
@@ -45,16 +45,16 @@ test_expect_success setup '
        git diff victim >mod-a-patch.with &&
        git diff --unified=0 >mod-a-patch.without &&
 
-       : remove from the head
+       # remove from the head
        for i in '"$L"' y
        do
                echo $i
        done >victim &&
        cat victim >del-a-expect &&
-       git diff victim >del-a-patch.with
+       git diff victim >del-a-patch.with &&
        git diff --unified=0 >del-a-patch.without &&
 
-       : add to the tail
+       # add to the tail
        for i in b '"$L"' y z
        do
                echo $i
@@ -63,7 +63,7 @@ test_expect_success setup '
        git diff victim >add-z-patch.with &&
        git diff --unified=0 >add-z-patch.without &&
 
-       : modify at the tail
+       # modify at the tail
        for i in b '"$L"' z
        do
                echo $i
@@ -72,16 +72,16 @@ test_expect_success setup '
        git diff victim >mod-z-patch.with &&
        git diff --unified=0 >mod-z-patch.without &&
 
-       : remove from the tail
+       # remove from the tail
        for i in b '"$L"'
        do
                echo $i
        done >victim &&
        cat victim >del-z-expect &&
-       git diff victim >del-z-patch.with
-       git diff --unified=0 >del-z-patch.without &&
+       git diff victim >del-z-patch.with &&
+       git diff --unified=0 >del-z-patch.without
 
-       : done
+       # done
 '
 
 for with in with without
@@ -95,10 +95,7 @@ do
                test_expect_success "apply $kind-patch $with context" '
                        cat original >victim &&
                        git update-index victim &&
-                       git apply --index '"$u$kind-patch.$with"' || {
-                               cat '"$kind-patch.$with"'
-                               (exit 1)
-                       } &&
+                       git apply --index '"$u$kind-patch.$with"' &&
                        test_cmp '"$kind"'-expect victim
                '
        done
@@ -113,10 +110,7 @@ do
        test_expect_success "apply non-git $kind-patch without context" '
                cat original >victim &&
                git update-index victim &&
-               git apply --unidiff-zero --index '"$kind-ng.without"' || {
-                       cat '"$kind-ng.without"'
-                       (exit 1)
-               } &&
+               git apply --unidiff-zero --index '"$kind-ng.without"' &&
                test_cmp '"$kind"'-expect victim
        '
 done
@@ -134,4 +128,13 @@ test_expect_success 'two lines' '
 
 '
 
+test_expect_success 'apply patch with 3 context lines matching at end' '
+       { echo a; echo b; echo c; echo d; } >file &&
+       git add file &&
+       echo e >>file &&
+       git diff >patch &&
+       >file &&
+       test_must_fail git apply patch
+'
+
 test_done