Skip to content

Commit

Permalink
Merge branch 'jc/diff-index-quick-exit-early'
Browse files Browse the repository at this point in the history
* jc/diff-index-quick-exit-early:
  diff-index --quiet: learn the "stop feeding the backend early" logic

Conflicts:
	unpack-trees.h
  • Loading branch information
Junio C Hamano committed Jun 30, 2011
2 parents a852aac + b419482 commit 57e4d61
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion diff-lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,13 @@ static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
if (tree == o->df_conflict_entry)
tree = NULL;

if (ce_path_match(idx ? idx : tree, &revs->prune_data))
if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
do_oneway_diff(o, idx, tree);
if (diff_can_quit_early(&revs->diffopt)) {
o->exiting_early = 1;
return -1;
}
}

return 0;
}
Expand Down
4 changes: 3 additions & 1 deletion unpack-trees.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1133,6 +1133,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
display_error_msgs(o);
mark_all_ce_unused(o->src_index);
ret = unpack_failed(o, NULL);
if (o->exiting_early)
ret = 0;
goto done;
}

Expand Down
1 change: 1 addition & 0 deletions unpack-trees.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct unpack_trees_options {
debug_unpack,
skip_sparse_checkout,
gently,
exiting_early,
show_all_errors,
dry_run;
const char *prefix;
Expand Down

0 comments on commit 57e4d61

Please sign in to comment.