undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Teach "git diff" to honour --[no-]ext-diff
This commit is contained in:
Junio C Hamano 2008-11-26 11:57:31 -08:00
commit aa14a0c3f1
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 */ /* Otherwise, we are doing the usual "git" diff */
rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index; rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
/* Default to let external be used */
DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
if (nongit) if (nongit)
die("Not a git repository"); die("Not a git repository");
argc = setup_revisions(argc, argv, &rev, NULL); 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) if (diff_setup_done(&rev.diffopt) < 0)
die("diff_setup_done failed"); die("diff_setup_done failed");
} }
DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
DIFF_OPT_SET(&rev.diffopt, RECURSIVE); DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);

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' ' test_expect_success 'diff attribute' '
git config diff.parrot.command echo && 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' ' test_expect_success 'diff attribute' '
git config --unset diff.parrot.command && 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' ' test_expect_success 'no diff with -diff' '
echo >.gitattributes "file -diff" && echo >.gitattributes "file -diff" &&
git diff | grep Binary git diff | grep Binary