aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:11 -0700
commit57e4d61686b20ef3ad4982753407cf0bd87335f2 (patch)
tree4a93746a700898c457f3d0be64d65cfa7dd6d086 /unpack-trees.c
parenta852aac48d881d538e24d5493e218a93b12b1709 (diff)
parentb4194828dc00e97dcd07ecb4bb4f87650a6fca1d (diff)
downloadgit-57e4d61686b20ef3ad4982753407cf0bd87335f2.tar.gz
git-57e4d61686b20ef3ad4982753407cf0bd87335f2.tar.xz
Merge branch 'jc/diff-index-quick-exit-early'
* 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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 07f836424..3a61d821e 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;
}