Skip to content

Commit

Permalink
tree_entry_interesting(): Make return value more specific
Browse files Browse the repository at this point in the history
tree_entry_interesting() can signal to its callers not only if the given
entry matches one of the specified paths, but whether all remaining paths
will (or will not) match.  When no paths are specified, all paths are
considered interesting, so intead of returning 1 (this path is interesting)
return 2 (all paths are interesting).

This will allow the caller to avoid calling tree_entry_interesting() again,
which theoretically should speed up tree walking.  I am not able to measure
any actual gains in practice, but it certainly can not hurt and seems to
make the code more readable to me.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Elijah Newren authored and Junio C Hamano committed Aug 26, 2010
1 parent dabb061 commit 4a5e74f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tree-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static int tree_entry_interesting(struct tree_desc *desc, const char *base, int
int never_interesting = -1;

if (!opt->nr_paths)
return 1;
return 2;

sha1 = tree_entry_extract(desc, &path, &mode);

Expand Down

0 comments on commit 4a5e74f

Please sign in to comment.