1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
#!/bin/sh
test_description='external diff interface test'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success setup '
test_tick &&
echo initial >file &&
git add file &&
git commit -m initial &&
test_tick &&
echo second >file &&
before=$(git hash-object file) &&
before=$(git rev-parse --short $before) &&
git add file &&
git commit -m second &&
test_tick &&
echo third >file
'
test_expect_success 'GIT_EXTERNAL_DIFF environment' '
cat >expect <<-EOF &&
file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
EOF
GIT_EXTERNAL_DIFF=echo git diff >out &&
cut -d" " -f1,3- <out >actual &&
test_cmp expect actual
'
test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' '
GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success SYMLINKS 'typechange diff' '
rm -f file &&
ln -s elif file &&
cat >expect <<-EOF &&
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
EOF
GIT_EXTERNAL_DIFF=echo git diff >out &&
cut -d" " -f1,3-4,6- <out >actual &&
test_cmp expect actual &&
GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
git diff >expect &&
test_cmp expect actual
'
test_expect_success 'diff.external' '
git reset --hard &&
echo third >file &&
test_config diff.external echo &&
cat >expect <<-EOF &&
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
EOF
git diff >out &&
cut -d" " -f1,3-4,6- <out >actual &&
test_cmp expect actual
'
test_expect_success 'diff.external should apply only to diff' '
test_config diff.external echo &&
git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'diff.external and --no-ext-diff' '
test_config diff.external echo &&
git diff --no-ext-diff >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute' '
git reset --hard &&
echo third >file &&
git config diff.parrot.command echo &&
echo >.gitattributes "file diff=parrot" &&
cat >expect <<-EOF &&
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
EOF
git diff >out &&
cut -d" " -f1,3-4,6- <out >actual &&
test_cmp expect actual
'
test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute and --no-ext-diff' '
git diff --no-ext-diff >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute' '
git config --unset diff.parrot.command &&
git config diff.color.command echo &&
echo >.gitattributes "file diff=color" &&
cat >expect <<-EOF &&
file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
EOF
git diff >out &&
cut -d" " -f1,3-4,6- <out >actual &&
test_cmp expect actual
'
test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
git log -p -1 HEAD >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'diff attribute and --no-ext-diff' '
git diff --no-ext-diff >out &&
grep "^diff --git a/file b/file" out
'
test_expect_success 'GIT_EXTERNAL_DIFF trumps diff.external' '
>.gitattributes &&
test_config diff.external "echo ext-global" &&
cat >expect <<-EOF &&
ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
EOF
GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
cut -d" " -f1-2,4- <out >actual &&
test_cmp expect actual
'
test_expect_success 'attributes trump GIT_EXTERNAL_DIFF and diff.external' '
test_config diff.foo.command "echo ext-attribute" &&
test_config diff.external "echo ext-global" &&
echo "file diff=foo" >.gitattributes &&
cat >expect <<-EOF &&
ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
EOF
GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
cut -d" " -f1-2,4- <out >actual &&
test_cmp expect actual
'
test_expect_success 'no diff with -diff' '
echo >.gitattributes "file -diff" &&
git diff >out &&
grep Binary out
'
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
test_expect_success 'force diff with "diff"' '
after=$(git hash-object file) &&
after=$(git rev-parse --short $after) &&
echo >.gitattributes "file diff" &&
git diff >actual &&
sed -e "s/^index .*/index $before..$after 100644/" \
"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
test_cmp expected-diff actual
'
test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' '
echo anotherfile > file2 &&
git add file2 &&
git commit -m "added 2nd file" &&
echo modified >file2 &&
GIT_EXTERNAL_DIFF=echo git diff
'
test_expect_success 'GIT_EXTERNAL_DIFF path counter/total' '
write_script external-diff.sh <<-\EOF &&
echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
EOF
>counter.txt &&
cat >expect <<-\EOF &&
1 of 2
2 of 2
EOF
GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
test_cmp expect counter.txt
'
test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
test_when_finished "git rm -f file.ext" &&
touch file.ext &&
git add file.ext &&
echo with extension > file.ext &&
cat >expect <<-EOF &&
file.ext
EOF
GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
basename $(cut -d" " -f2 <out) >actual &&
test_cmp expect actual
'
echo "#!$SHELL_PATH" >fake-diff.sh
cat >> fake-diff.sh <<\EOF
cat $2 >> crlfed.txt
EOF
chmod a+x fake-diff.sh
keep_only_cr () {
tr -dc '\015'
}
test_expect_success 'external diff with autocrlf = true' '
test_config core.autocrlf true &&
GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
'
test_expect_success 'diff --cached' '
test_config core.autocrlf true &&
git add file &&
git update-index --assume-unchanged file &&
echo second >file &&
git diff --cached >actual &&
test_cmp expected-diff actual
'
test_expect_success 'clean up crlf leftovers' '
git update-index --no-assume-unchanged file &&
rm -f file* &&
git reset --hard
'
test_expect_success 'submodule diff' '
git init sub &&
( cd sub && test_commit sub1 ) &&
git add sub &&
test_tick &&
git commit -m "add submodule" &&
( cd sub && test_commit sub2 ) &&
write_script gather_pre_post.sh <<-\EOF &&
echo "$1 $4" # path, mode
cat "$2" # old file
cat "$5" # new file
EOF
GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
cat >expected <<-EOF &&
sub 160000
Subproject commit $(git rev-parse HEAD:sub)
Subproject commit $(cd sub && git rev-parse HEAD)
EOF
test_cmp expected actual
'
test_done
|
