kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/maint-diff-quiet' into maint 

* 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
maint
Junio C Hamano 2008-09-18 19:53:12 -07:00
parent a3fcc0562c df58a8274d
commit 01409bbf75
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

@ -2400,13 +2400,6 @@ int diff_setup_done(struct diff_options *options)
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;
}

@ -3398,10 +3391,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)

void diffcore_std(struct diff_options *options)
{
if (DIFF_OPT_TST(options, QUIET))
return;

if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
if (options->skip_stat_unmatch)
diffcore_skip_stat_unmatch(options);
if (options->break_opt != -1)
diffcore_break(options->break_opt);