]>
Commit | Line | Data |
---|---|---|
41bbf9d5 AR |
1 | #!/bin/sh |
2 | ||
3 | test_description='Return value of diffs' | |
4 | ||
5 | . ./test-lib.sh | |
6 | ||
7 | test_expect_success 'setup' ' | |
1caaf225 LA |
8 | echo "1 " >a && |
9 | git add . && | |
10 | git commit -m zeroth && | |
41bbf9d5 AR |
11 | echo 1 >a && |
12 | git add . && | |
13 | git commit -m first && | |
14 | echo 2 >b && | |
15 | git add . && | |
16 | git commit -a -m second | |
17 | ' | |
18 | ||
1caaf225 LA |
19 | test_expect_success 'git diff --quiet -w HEAD^^ HEAD^' ' |
20 | git diff --quiet -w HEAD^^ HEAD^ | |
21 | ' | |
22 | ||
23 | test_expect_success 'git diff --quiet HEAD^^ HEAD^' ' | |
24 | test_must_fail git diff --quiet HEAD^^ HEAD^ | |
25 | ' | |
26 | ||
27 | test_expect_success 'git diff --quiet -w HEAD^ HEAD' ' | |
28 | test_must_fail git diff --quiet -w HEAD^ HEAD | |
29 | ' | |
30 | ||
41bbf9d5 | 31 | test_expect_success 'git diff-tree HEAD^ HEAD' ' |
dd0c69e9 | 32 | test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD |
41bbf9d5 AR |
33 | ' |
34 | test_expect_success 'git diff-tree HEAD^ HEAD -- a' ' | |
35 | git diff-tree --exit-code HEAD^ HEAD -- a | |
41bbf9d5 AR |
36 | ' |
37 | test_expect_success 'git diff-tree HEAD^ HEAD -- b' ' | |
dd0c69e9 | 38 | test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- b |
41bbf9d5 AR |
39 | ' |
40 | test_expect_success 'echo HEAD | git diff-tree --stdin' ' | |
dd0c69e9 | 41 | echo $(git rev-parse HEAD) | test_expect_code 1 git diff-tree --exit-code --stdin |
41bbf9d5 AR |
42 | ' |
43 | test_expect_success 'git diff-tree HEAD HEAD' ' | |
44 | git diff-tree --exit-code HEAD HEAD | |
41bbf9d5 AR |
45 | ' |
46 | test_expect_success 'git diff-files' ' | |
47 | git diff-files --exit-code | |
41bbf9d5 AR |
48 | ' |
49 | test_expect_success 'git diff-index --cached HEAD' ' | |
50 | git diff-index --exit-code --cached HEAD | |
41bbf9d5 AR |
51 | ' |
52 | test_expect_success 'git diff-index --cached HEAD^' ' | |
dd0c69e9 | 53 | test_expect_code 1 git diff-index --exit-code --cached HEAD^ |
41bbf9d5 AR |
54 | ' |
55 | test_expect_success 'git diff-index --cached HEAD^' ' | |
56 | echo text >>b && | |
57 | echo 3 >c && | |
dd0c69e9 EN |
58 | git add . && |
59 | test_expect_code 1 git diff-index --exit-code --cached HEAD^ | |
41bbf9d5 AR |
60 | ' |
61 | test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' ' | |
dd0c69e9 EN |
62 | git commit -m "text in b" && |
63 | test_expect_code 1 git diff-tree -p --exit-code -Stext HEAD^ HEAD -- b | |
41bbf9d5 AR |
64 | ' |
65 | test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' ' | |
66 | git diff-tree -p --exit-code -Snot-found HEAD^ HEAD -- b | |
41bbf9d5 AR |
67 | ' |
68 | test_expect_success 'git diff-files' ' | |
dd0c69e9 EN |
69 | echo 3 >>c && |
70 | test_expect_code 1 git diff-files --exit-code | |
41bbf9d5 AR |
71 | ' |
72 | test_expect_success 'git diff-index --cached HEAD' ' | |
dd0c69e9 EN |
73 | git update-index c && |
74 | test_expect_code 1 git diff-index --exit-code --cached HEAD | |
41bbf9d5 AR |
75 | ' |
76 | ||
5973a079 WC |
77 | test_expect_success '--check --exit-code returns 0 for no difference' ' |
78 | ||
79 | git diff --check --exit-code | |
80 | ||
81 | ' | |
82 | ||
83 | test_expect_success '--check --exit-code returns 1 for a clean difference' ' | |
84 | ||
85 | echo "good" > a && | |
dd0c69e9 | 86 | test_expect_code 1 git diff --check --exit-code |
5973a079 WC |
87 | |
88 | ' | |
89 | ||
90 | test_expect_success '--check --exit-code returns 3 for a dirty difference' ' | |
91 | ||
92 | echo "bad " >> a && | |
dd0c69e9 | 93 | test_expect_code 3 git diff --check --exit-code |
5973a079 WC |
94 | |
95 | ' | |
96 | ||
97 | test_expect_success '--check with --no-pager returns 2 for dirty difference' ' | |
98 | ||
dd0c69e9 | 99 | test_expect_code 2 git --no-pager diff --check |
5973a079 WC |
100 | |
101 | ' | |
102 | ||
18374e58 JH |
103 | test_expect_success 'check should test not just the last line' ' |
104 | echo "" >>a && | |
dd0c69e9 | 105 | test_expect_code 2 git --no-pager diff --check |
18374e58 JH |
106 | |
107 | ' | |
108 | ||
04954043 JH |
109 | test_expect_success 'check detects leftover conflict markers' ' |
110 | git reset --hard && | |
111 | git checkout HEAD^ && | |
112 | echo binary >>b && | |
113 | git commit -m "side" b && | |
114 | test_must_fail git merge master && | |
dd0c69e9 EN |
115 | git add b && |
116 | test_expect_code 2 git --no-pager diff --cached --check >test.out && | |
ab20fda9 | 117 | test 3 = $(grep "conflict marker" test.out | wc -l) && |
04954043 JH |
118 | git reset --hard |
119 | ' | |
120 | ||
a757c646 JH |
121 | test_expect_success 'check honors conflict marker length' ' |
122 | git reset --hard && | |
123 | echo ">>>>>>> boo" >>b && | |
124 | echo "======" >>a && | |
125 | git diff --check a && | |
dd0c69e9 | 126 | test_expect_code 2 git diff --check b && |
a757c646 JH |
127 | git reset --hard && |
128 | echo ">>>>>>>> boo" >>b && | |
129 | echo "========" >>a && | |
130 | git diff --check && | |
131 | echo "b conflict-marker-size=8" >.gitattributes && | |
dd0c69e9 | 132 | test_expect_code 2 git diff --check b && |
a757c646 JH |
133 | git diff --check a && |
134 | git reset --hard | |
135 | ' | |
136 | ||
41bbf9d5 | 137 | test_done |