Merge branch 'jc/diff-index-quick-exit-early'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:11 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:11 +0000 (17:03 -0700)
* jc/diff-index-quick-exit-early:
  diff-index --quiet: learn the "stop feeding the backend early" logic

Conflicts:
unpack-trees.h

1  2 
unpack-trees.c
unpack-trees.h

diff --cc unpack-trees.c
Simple merge
diff --cc unpack-trees.h
index 64f02cb03ab242ac08ea0f1afbb24e71cf6664aa,4c6c54033e2d319a305e9a82d06e48e570f4f871..79989483079970e9dad42512e522eef8ea2a75a4
@@@ -46,8 -46,8 +46,9 @@@ struct unpack_trees_options 
                     debug_unpack,
                     skip_sparse_checkout,
                     gently,
 -                   show_all_errors;
+                    exiting_early,
 +                   show_all_errors,
 +                   dry_run;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;