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

Merge branch 'jc/maint-diff-quiet'

Browse Source 
* jc/maint-diff-quiet:
  diff --quiet: make it synonym to --exit-code >/dev/null
  diff Porcelain: do not disable auto index refreshing on -C -C
This commit is contained in:
Junio C Hamano 2008-09-16 00:48:16 -07:00
commit 8e909f80b4
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
diff.c
View File

@ -2403,13 +2403,6 @@ int diff_setup_done(struct diff_options *options)
DIFF_OPT_SET(options, EXIT_WITH_STATUS); DIFF_OPT_SET(options, EXIT_WITH_STATUS);
} }
/*
* If we postprocess in diffcore, we cannot simply return
* upon the first hit. We need to run diff as usual.
*/
if (options->pickaxe || options->filter)
DIFF_OPT_CLR(options, QUIET);
return 0; return 0;
} }
@ -3397,10 +3390,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
void diffcore_std(struct diff_options *options) void diffcore_std(struct diff_options *options)
{ {
if (DIFF_OPT_TST(options, QUIET)) if (options->skip_stat_unmatch)
return;
if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
diffcore_skip_stat_unmatch(options); diffcore_skip_stat_unmatch(options);
if (options->break_opt != -1) if (options->break_opt != -1)
diffcore_break(options->break_opt); diffcore_break(options->break_opt);