Junio C Hamano schrieb: > "Nazri Ramliy" <ayiehere@xxxxxxxxx> writes: > >> git-diff does not honor the --no-ext-diff option in both cases when the external >> diff program is set via diff.external and gitattributes. >> >> Is this intentional? > > Judging from 72909be (Add diff-option --ext-diff, 2007-06-30), I think > this was intended in the sense that --ext-diff and --no-ext-diff were > meant to be no-op for "diff" itself when they were introduced. > > Having said that, I do not know if I agree with the original intention. > It looks more like an oversight that came from focusing only on what a new > behaviour for the "log" family should be, than a logical design decision > to exclude "diff" from this codepath. > > Wouldn't this be a better patch? Yes. And feel free to squash in the following. :) diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index dfe3fbc..ec787b4 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
