diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:59 (GMT) |
| commit | 12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d (patch) | |
| tree | fba33edaee8716bf482f11de261f6af23568636a /t | |
| parent | 68731c7ec780f1ad1c08d9c9c7d297cdc553a118 (diff) | |
| parent | 287ab28bfae14431f3f57abeb92149c460044850 (diff) | |
| download | git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.zip git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.tar.gz git-12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d.tar.bz2 | |
Merge branch 'jk/diff-no-index-initialize'
"git diff --no-index" may still want to access Git goodies like
--ext-diff and --textconv, but so far these have been ignored,
which has been corrected.
* jk/diff-no-index-initialize:
diff: reuse diff setup for --no-index case
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4053-diff-no-index.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh index 6e0dd6f..4331b31 100755 --- a/t/t4053-diff-no-index.sh +++ b/t/t4053-diff-no-index.sh @@ -137,4 +137,12 @@ test_expect_success 'diff --no-index from repo subdir with absolute paths' ' test_cmp expect actual ' +test_expect_success 'diff --no-index allows external diff' ' + test_expect_code 1 \ + env GIT_EXTERNAL_DIFF="echo external ;:" \ + git diff --no-index non/git/a non/git/b >actual && + echo external >expect && + test_cmp expect actual +' + test_done |