diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:23:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:23:25 -0700 |
| commit | f253376dcbadb384d8c8af287c3f9e2271cb5ff4 (patch) | |
| tree | 32382322a78e71a1552daec2d64582647e2190e1 /unpack-trees.c | |
| parent | e10e476fb170a99ecc535a31def69d5e3483a859 (diff) | |
| parent | b4194828dc00e97dcd07ecb4bb4f87650a6fca1d (diff) | |
| download | git-f253376dcbadb384d8c8af287c3f9e2271cb5ff4.tar.gz | |
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
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e22b9ec408..cc616c3f99 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -593,7 +593,7 @@ static int unpack_nondirectories(int n, unsigned long mask, static int unpack_failed(struct unpack_trees_options *o, const char *message) { discard_index(&o->result); - if (!o->gently) { + if (!o->gently && !o->exiting_early) { if (message) return error("%s", message); return -1; @@ -1133,6 +1133,8 @@ return_failed: display_error_msgs(o); mark_all_ce_unused(o->src_index); ret = unpack_failed(o, NULL); + if (o->exiting_early) + ret = 0; goto done; } |