From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2011 21:55:17 +0000 (-0700)
Subject: Merge branch 'jc/maint-diff-q-filter'
X-Git-Tag: v1.7.5-rc0~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d0cf357a31cc8a442342696788d776265482ce9;p=git.git

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

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

7d0cf357a31cc8a442342696788d776265482ce9
diff --cc diff-lib.c
index 1e22992cb,bfa650337..2870de400
--- a/diff-lib.c
+++ b/diff-lib.c
@@@ -100,13 -72,13 +100,14 @@@ 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))
 +		if (!ce_path_match(ce, &revs->prune_data))
  			continue;
  
  		if (ce_stage(ce)) {