diff --quiet: disable optimization when --diff-filter=X is used

The code notices that the caller does not want any detail of the changes and only wants to know if there is a change or not by specifying --quiet. And it breaks out of the loop when it knows it already found any change. When you have a post-process filter (e.g. --diff-filter), however, the path we found to be different in the previous round and set HAS_CHANGES bit may end up being uninteresting, and there may be no output at the end. The optimization needs to be disabled for such case. Note that the f245194 (diff: change semantics of "ignore whitespace" options, 2009-05-22) already disables this optimization by refraining from setting HAS_CHANGES when post-process filters that need to inspect the contents of the files (e.g. -S, -w) in diff_change() function. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 16, 2011 at 15:46 UTC 2cfe8a68ccba86f046080f890102a9a43361cfdd

2 files changed +9 -1

diff-lib.c

+2 -1

@@ -74,7 +74,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)

74 int changed;

76 if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&

77 - DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))

77 + !revs->diffopt.filter &&

78 + DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))

79 break;

81 if (!ce_path_match(ce, revs->prune_data))

t/t4037-whitespace-status.sh

@@ -60,4 +60,11 @@ test_expect_success 'diff-files -b -p --exit-code' '

60 git diff-files -b -p --exit-code

61 '

63 +test_expect_success 'diff-files --diff-filter --quiet' '

64 + git reset --hard &&

65 + rm a/d &&

66 + echo x >>b/e &&

67 + test_must_fail git diff-files --diff-filter=M --quiet

68 +'

69 +

70 test_done