On Fri, Jun 15, 2012 at 02:40:30PM -0400, Jeff King wrote: > I suspect what you actually want is to set DIFF_FROM_CONTENTS in the > no-index case, since we by definition do not have a pair of sha1s to > compare. But it may also be that diff.c could detect this case > automatically. I'd have to look closer. This works for me: diff --git a/diff.c b/diff.c index 77edd50..27231d2 100644 --- a/diff.c +++ b/diff.c @@ -3228,7 +3228,8 @@ int diff_setup_done(struct diff_options *options) if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) || DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) || - DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL)) + DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL) || + DIFF_OPT_TST(options, NO_INDEX)) DIFF_OPT_SET(options, DIFF_FROM_CONTENTS); else DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS); One could also set DIFF_FROM_CONTENTS manually in diff_on_index, but note that diff_setup_done unsets it (which seems odd; who would have set it in the first place if they did not want to override it? I think that else clause can simply be dropped). -Peff PS Your test should probably be spelled with test_expect_code, like: diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh index cdb9202..0b83235 100755 --- a/t/t4035-diff-quiet.sh +++ b/t/t4035-diff-quiet.sh @@ -77,4 +77,8 @@ test_expect_success 'git diff-index --cached HEAD' ' } ' +test_expect_success 'git diff <tracked file> <file outside repo>' ' + test_expect_code 1 git diff --quiet c /dev/null +' + test_done -- 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