Merge branch 'maint'

[git.git] / t / t4117-apply-reject.sh

diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
index 3362819c3a21a731d2fe0b53128cb2cb1d51ea90..659e17c92e474ad5828656f83d28cab2a5ecac64 100755 (executable)
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply with rejects
+test_description='git apply with rejects
 
 '
 
@@ -23,6 +23,12 @@ test_expect_success setup '
                echo $i
        done >file1 &&
        git diff >patch.1 &&
+       cat file1 >clean &&
+
+       for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21
+       do
+               echo $i
+       done >expected &&
 
        mv file1 file2 &&
        git update-index --add --remove file1 file2 &&
@@ -48,30 +54,46 @@ test_expect_success 'apply without --reject should fail' '
                exit 1
        fi
 
-       diff -u file1 saved.file1
+       git diff file1 saved.file1
+'
+
+test_expect_success 'apply without --reject should fail' '
+
+       if git apply --verbose patch.1
+       then
+               echo "Eh? Why?"
+               exit 1
+       fi
+
+       git diff file1 saved.file1
 '
 
 test_expect_success 'apply with --reject should fail but update the file' '
 
-       cat saved.file1 >file1
+       cat saved.file1 >file1 &&
+       rm -f file1.rej file2.rej &&
 
-       if git apply --reject patch.1 >rejects
+       if git apply --reject patch.1
        then
                echo "succeeds with --reject?"
                exit 1
        fi
-       cat rejects
-       for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21
-       do
-               echo $i
-       done >expected.file1 &&
 
-       diff -u file1 expected.file1
+       git diff file1 expected &&
+
+       cat file1.rej &&
+
+       if test -f file2.rej
+       then
+               echo "file2 should not have been touched"
+               exit 1
+       fi
 '
 
 test_expect_success 'apply with --reject should fail but update the file' '
 
-       cat saved.file1 >file1
+       cat saved.file1 >file1 &&
+       rm -f file1.rej file2.rej file2 &&
 
        if git apply --reject patch.2 >rejects
        then
@@ -79,18 +101,57 @@ test_expect_success 'apply with --reject should fail but update the file' '
                exit 1
        fi
 
-       cat rejects
+       test -f file1 && {
+               echo "file1 still exists?"
+               exit 1
+       }
+       git diff file2 expected &&
 
-       for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21
-       do
-               echo $i
-       done >expected.file2 &&
+       cat file2.rej &&
+
+       if test -f file1.rej
+       then
+               echo "file2 should not have been touched"
+               exit 1
+       fi
+
+'
+
+test_expect_success 'the same test with --verbose' '
+
+       cat saved.file1 >file1 &&
+       rm -f file1.rej file2.rej file2 &&
+
+       if git apply --reject --verbose patch.2 >rejects
+       then
+               echo "succeeds with --reject?"
+               exit 1
+       fi
 
        test -f file1 && {
                echo "file1 still exists?"
                exit 1
        }
-       diff -u file2 expected.file2
+       git diff file2 expected &&
+
+       cat file2.rej &&
+
+       if test -f file1.rej
+       then
+               echo "file2 should not have been touched"
+               exit 1
+       fi
+
+'
+
+test_expect_success 'apply cleanly with --verbose' '
+
+       git cat-file -p HEAD:file1 >file1 &&
+       rm -f file?.rej file2 &&
+
+       git apply --verbose patch.1 &&
+
+       git diff file1 clean
 '
 
 test_done