From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Apr 2011 23:23:34 +0000 (-0700)
Subject: Merge branch 'jc/maint-diff-q-filter' into maint
X-Git-Tag: v1.7.4.3~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bcf3d1fd9ccc04350d793c077d3c112fb26f43f0;p=git-core%2Fgit.git

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

* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used
---

bcf3d1fd9ccc04350d793c077d3c112fb26f43f0
diff --cc diff-lib.c
index 392ce2bef,bfa650337..f8e33256e
--- a/diff-lib.c
+++ b/diff-lib.c
@@@ -100,10 -72,10 +100,11 @@@ int run_diff_files(struct rev_info *rev
  		unsigned int oldmode, newmode;
  		struct cache_entry *ce = active_cache[i];
  		int changed;
 +		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))