summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-08-26 06:21:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-26 16:53:36 (GMT)
commit4a5e74feb1a75a479acbc2f839e930966fdc2f2f (patch)
tree6556eb4d2c1ce1c7692258dbb681e45f6559a668 /tree-diff.c
parentdabb061fa358e8884889632f0be5b6c76916c893 (diff)
downloadgit-4a5e74feb1a75a479acbc2f839e930966fdc2f2f.zip
git-4a5e74feb1a75a479acbc2f839e930966fdc2f2f.tar.gz
git-4a5e74feb1a75a479acbc2f839e930966fdc2f2f.tar.bz2
tree_entry_interesting(): Make return value more specific
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>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 4d85fef..1b41b7f 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -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);