mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t4020-diff-external.sh
blobed3bd5b3fe7c8b5ca52067e3015e0d770ee79bf2
1 #!/bin/sh
3 test_description='external diff interface test'
5 . ./test-lib.sh
7 _z40=0000000000000000000000000000000000000000
9 test_expect_success setup '
11 test_tick &&
12 echo initial >file &&
13 git add file &&
14 git commit -m initial &&
16 test_tick &&
17 echo second >file &&
18 git add file &&
19 git commit -m second &&
21 test_tick &&
22 echo third >file
25 test_expect_success 'GIT_EXTERNAL_DIFF environment' '
27 GIT_EXTERNAL_DIFF=echo git diff | {
28 read path oldfile oldhex oldmode newfile newhex newmode &&
29 test "z$path" = zfile &&
30 test "z$oldmode" = z100644 &&
31 test "z$newhex" = "z$_z40" &&
32 test "z$newmode" = z100644 &&
33 oh=$(git rev-parse --verify HEAD:file) &&
34 test "z$oh" = "z$oldhex"
39 test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
41 GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD |
42 grep "^diff --git a/file b/file"
46 test_expect_success 'diff attribute' '
48 git config diff.parrot.command echo &&
50 echo >.gitattributes "file diff=parrot" &&
52 git diff | {
53 read path oldfile oldhex oldmode newfile newhex newmode &&
54 test "z$path" = zfile &&
55 test "z$oldmode" = z100644 &&
56 test "z$newhex" = "z$_z40" &&
57 test "z$newmode" = z100644 &&
58 oh=$(git rev-parse --verify HEAD:file) &&
59 test "z$oh" = "z$oldhex"
64 test_expect_success 'diff attribute should apply only to diff' '
66 git log -p -1 HEAD |
67 grep "^diff --git a/file b/file"
71 test_expect_success 'diff attribute' '
73 git config --unset diff.parrot.command &&
74 git config diff.color.command echo &&
76 echo >.gitattributes "file diff=color" &&
78 git diff | {
79 read path oldfile oldhex oldmode newfile newhex newmode &&
80 test "z$path" = zfile &&
81 test "z$oldmode" = z100644 &&
82 test "z$newhex" = "z$_z40" &&
83 test "z$newmode" = z100644 &&
84 oh=$(git rev-parse --verify HEAD:file) &&
85 test "z$oh" = "z$oldhex"
90 test_expect_success 'diff attribute should apply only to diff' '
92 git log -p -1 HEAD |
93 grep "^diff --git a/file b/file"
97 test_expect_success 'no diff with -diff' '
98 echo >.gitattributes "file -diff" &&
99 git diff | grep Binary
102 echo NULZbetweenZwords | tr Z '\0' > file
104 test_expect_success 'force diff with "diff"' '
105 echo >.gitattributes "file diff" &&
106 git diff | grep -a second
109 test_done