mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-diff-q-filter'

Browse Source 
* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used
This commit is contained in:
Junio C Hamano
2011-03-23 14:55:17 -07:00
parent 98b256bd08 2cfe8a68cc
commit 7d0cf357a3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
diff-lib.c
View File

@ -103,7 +103,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
unsigned dirty_submodule = 0;
if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
!revs->diffopt.filter &&
DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
break;
if (!ce_path_match(ce, &revs->prune_data))