diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-26 19:57:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-26 19:57:31 (GMT) |
| commit | aa14a0c3f191ee4df7344eed119be5b4a527a0ff (patch) | |
| tree | 1f0b79d76fef5d196d2aeed2e858c2866e71a6a0 /t/t4020-diff-external.sh | |
| parent | 78a0014d807dd74aec160c6fc6db8e2fb7e7e9b1 (diff) | |
| parent | 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0 (diff) | |
| download | git-aa14a0c3f191ee4df7344eed119be5b4a527a0ff.zip git-aa14a0c3f191ee4df7344eed119be5b4a527a0ff.tar.gz git-aa14a0c3f191ee4df7344eed119be5b4a527a0ff.tar.bz2 | |
Merge branch 'maint'
* maint:
Teach "git diff" to honour --[no-]ext-diff
Diffstat (limited to 't/t4020-diff-external.sh')
| -rwxr-xr-x | t/t4020-diff-external.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index dfe3fbc..caea292 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -43,6 +43,13 @@ test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' ' ' +test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' ' + + GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff | + grep "^diff --git a/file b/file" + +' + test_expect_success 'diff attribute' ' git config diff.parrot.command echo && @@ -68,6 +75,13 @@ test_expect_success 'diff attribute should apply only to diff' ' ' +test_expect_success 'diff attribute and --no-ext-diff' ' + + git diff --no-ext-diff | + grep "^diff --git a/file b/file" + +' + test_expect_success 'diff attribute' ' git config --unset diff.parrot.command && @@ -94,6 +108,13 @@ test_expect_success 'diff attribute should apply only to diff' ' ' +test_expect_success 'diff attribute and --no-ext-diff' ' + + git diff --no-ext-diff | + grep "^diff --git a/file b/file" + +' + test_expect_success 'no diff with -diff' ' echo >.gitattributes "file -diff" && git diff | grep Binary |