From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Aug 2011 18:23:25 +0000 (-0700)
Subject: Merge branch 'jc/diff-index-quick-exit-early' into maint
X-Git-Tag: v1.7.6.1~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f253376dcbadb384d8c8af287c3f9e2271cb5ff4;p=git.git

Merge branch 'jc/diff-index-quick-exit-early' into maint

* jc/diff-index-quick-exit-early:
  diff-index --quiet: learn the "stop feeding the backend early" logic

Conflicts:
	unpack-trees.h
---

f253376dcbadb384d8c8af287c3f9e2271cb5ff4
diff --cc unpack-trees.h
index 64f02cb03,4c6c54033..799894830
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@@ -46,8 -46,8 +46,9 @@@ struct unpack_trees_options 
  		     debug_unpack,
  		     skip_sparse_checkout,
  		     gently,
+ 		     exiting_early,
 -		     show_all_errors;
 +		     show_all_errors,
 +		     dry_run;
  	const char *prefix;
  	int cache_bottom;
  	struct dir_struct *dir;