summaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
blob: bf8f778a471b7fdb21b6e6df473222593439ba34 (plain)
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
#!/bin/sh
 
test_description='external diff interface test'
 
. ./test-lib.sh
 
_z40=0000000000000000000000000000000000000000
 
test_expect_success setup '
 
	test_tick &&
	echo initial >file &&
	git add file &&
	git commit -m initial &&
 
	test_tick &&
	echo second >file &&
	git add file &&
	git commit -m second &&
 
	test_tick &&
	echo third >file
'
 
test_expect_success 'GIT_EXTERNAL_DIFF environment' '
 
	GIT_EXTERNAL_DIFF=echo git diff | {
		read path oldfile oldhex oldmode newfile newhex newmode &&
		test "z$path" = zfile &&
		test "z$oldmode" = z100644 &&
		test "z$newhex" = "z$_z40" &&
		test "z$newmode" = z100644 &&
		oh=$(git rev-parse --verify HEAD:file) &&
		test "z$oh" = "z$oldhex"
	}
 
'
 
test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
 
	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD |
	grep "^diff --git a/file b/file"
 
'
 
test_expect_success 'diff attribute' '
 
	git config diff.parrot.command echo &&
 
	echo >.gitattributes "file diff=parrot" &&
 
	git diff | {
		read path oldfile oldhex oldmode newfile newhex newmode &&
		test "z$path" = zfile &&
		test "z$oldmode" = z100644 &&
		test "z$newhex" = "z$_z40" &&
		test "z$newmode" = z100644 &&
		oh=$(git rev-parse --verify HEAD:file) &&
		test "z$oh" = "z$oldhex"
	}
 
'
 
test_expect_success 'diff attribute should apply only to diff' '
 
	git log -p -1 HEAD |
	grep "^diff --git a/file b/file"
 
'
 
test_expect_success 'diff attribute' '
 
	git config --unset diff.parrot.command &&
	git config diff.color.command echo &&
 
	echo >.gitattributes "file diff=color" &&
 
	git diff | {
		read path oldfile oldhex oldmode newfile newhex newmode &&
		test "z$path" = zfile &&
		test "z$oldmode" = z100644 &&
		test "z$newhex" = "z$_z40" &&
		test "z$newmode" = z100644 &&
		oh=$(git rev-parse --verify HEAD:file) &&
		test "z$oh" = "z$oldhex"
	}
 
'
 
test_expect_success 'diff attribute should apply only to diff' '
 
	git log -p -1 HEAD |
	grep "^diff --git a/file b/file"
 
'
 
test_expect_success 'no diff with -diff' '
	echo >.gitattributes "file -diff" &&
	git diff | grep Binary
'
 
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
 
test_expect_success 'force diff with "diff"' '
	echo >.gitattributes "file diff" &&
	git diff | grep -a second
'
 
test_done