development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Teach "git diff" to honour --[no-]ext-diff

Browse source 
The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30)
was to optionally allow the use of external diff viewer in "git log"
family (while keeping them disabled by default).  It exposed the "allow
external diff" bit to the UI, but forgot to adjust the "git diff" codepath
that was set up to always allow use of the external diff viewer.

Noticed by Nazri Ramliy; tests by René Scharfe squashed in.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-11-26 09:58:41 -08:00
parent 37a7744ffe
commit 61af494ca4
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin-diff.c
View file

@ -290,6 +290,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
/* Otherwise, we are doing the usual "git" diff */
rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
/* Default to let external be used */
DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
if (nongit)
die("Not a git repository");
argc = setup_revisions(argc, argv, &rev, NULL);
@ -298,7 +301,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
if (diff_setup_done(&rev.diffopt) < 0)
die("diff_setup_done failed");
}
DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
/*

21
t/t4020-diff-external.sh
View file

@ -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