@matheusbsbs / matheus-bagliano / commits / df58a8274d
Fork 0

diff --quiet: make it synonym to --exit-code >/dev/null

The point of --quiet was to return the status as early as possible without doing any extra processing. Well behaved scripts, when they expect to run many diff operations inside, are supposed to run "update-index --refresh" upfront; we do not want them to pay the price of iterating over the index and comparing the contents to fix the stat dirtiness, and we avoided most of the processing in diffcore_std() when --quiet is in effect. But scripts that adhere to the good practice won't have to pay any more price than the necessary lstat(2) that will report stat cleanliness, as long as only -q is given without any fancier diff options. More importantly, users who do ask for "--quiet -M --filter=D" (in order to notice only the deletion, not paths that disappeared only because they have been renamed away) deserve to get the result they asked for, even it means they have to pay the extra price; the alternative is to get a cheap early return that gives a result they did not ask for, which is much worse. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Sep 1, 2008 at 23:20 UTC df58a8274d6865020682a6739bc59b87a9761991
1 file changed -10
diff.c
-10
@@ -2393,13 +2393,6 @@ int diff_setup_done(struct diff_options *options)
2393 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2394 }
2395
2396 - /*
2397 - * If we postprocess in diffcore, we cannot simply return
2398 - * upon the first hit. We need to run diff as usual.
2399 - */
2400 - if (options->pickaxe || options->filter)
2401 - DIFF_OPT_CLR(options, QUIET);
2402 -
2396 return 0;
2397 }
2398
@@ -3391,9 +3384,6 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3384
3385 void diffcore_std(struct diff_options *options)
3386 {
3394 - if (DIFF_OPT_TST(options, QUIET))
3395 - return;
3396 -
3387 if (options->skip_stat_unmatch)
3388 diffcore_skip_stat_unmatch(options);
3389 if (options->break_opt != -1)