core.hidedotfiles: hide '.git' dir by default
[git/dscho.git] / t / t4117-apply-reject.sh
blob8e15ecbdfdb497fcaa077fd1e6b3f882c9a46cb4
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='git apply with rejects
10 . ./test-lib.sh
12 test_expect_success setup '
13 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
15 echo $i
16 done >file1 &&
17 cat file1 >saved.file1 &&
18 git update-index --add file1 &&
19 git commit -m initial &&
21 for i in 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21
23 echo $i
24 done >file1 &&
25 git diff >patch.1 &&
26 cat file1 >clean &&
28 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
30 echo $i
31 done >expected &&
33 mv file1 file2 &&
34 git update-index --add --remove file1 file2 &&
35 git diff -M HEAD >patch.2 &&
37 rm -f file1 file2 &&
38 mv saved.file1 file1 &&
39 git update-index --add --remove file1 file2 &&
41 for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21
43 echo $i
44 done >file1 &&
46 cat file1 >saved.file1
49 test_expect_success 'apply --reject is incompatible with --3way' '
50 test_when_finished "cat saved.file1 >file1" &&
51 git diff >patch.0 &&
52 git checkout file1 &&
53 test_must_fail git apply --reject --3way patch.0 &&
54 git diff --exit-code
57 test_expect_success 'apply without --reject should fail' '
59 if git apply patch.1
60 then
61 echo "Eh? Why?"
62 exit 1
65 test_cmp file1 saved.file1
68 test_expect_success 'apply without --reject should fail' '
70 if git apply --verbose patch.1
71 then
72 echo "Eh? Why?"
73 exit 1
76 test_cmp file1 saved.file1
79 test_expect_success 'apply with --reject should fail but update the file' '
81 cat saved.file1 >file1 &&
82 rm -f file1.rej file2.rej &&
84 if git apply --reject patch.1
85 then
86 echo "succeeds with --reject?"
87 exit 1
90 test_cmp file1 expected &&
92 cat file1.rej &&
94 if test -f file2.rej
95 then
96 echo "file2 should not have been touched"
97 exit 1
101 test_expect_success 'apply with --reject should fail but update the file' '
103 cat saved.file1 >file1 &&
104 rm -f file1.rej file2.rej file2 &&
106 if git apply --reject patch.2 >rejects
107 then
108 echo "succeeds with --reject?"
109 exit 1
112 test -f file1 && {
113 echo "file1 still exists?"
114 exit 1
116 test_cmp file2 expected &&
118 cat file2.rej &&
120 if test -f file1.rej
121 then
122 echo "file2 should not have been touched"
123 exit 1
128 test_expect_success 'the same test with --verbose' '
130 cat saved.file1 >file1 &&
131 rm -f file1.rej file2.rej file2 &&
133 if git apply --reject --verbose patch.2 >rejects
134 then
135 echo "succeeds with --reject?"
136 exit 1
139 test -f file1 && {
140 echo "file1 still exists?"
141 exit 1
143 test_cmp file2 expected &&
145 cat file2.rej &&
147 if test -f file1.rej
148 then
149 echo "file2 should not have been touched"
150 exit 1
155 test_expect_success 'apply cleanly with --verbose' '
157 git cat-file -p HEAD:file1 >file1 &&
158 rm -f file?.rej file2 &&
160 git apply --verbose patch.1 &&
162 test_cmp file1 clean
165 test_done