X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree.c;h=676e9f710ca8d5a568e0c6ea2fa88132da81b48c;hb=c32c95916549331a581fadfa749c4322c14ccd78;hp=e62219803bee42889103e9607816f2d4125b6603;hpb=0de1633783685e9fb1943551217cdda7edbd245b;p=git.git diff --git a/tree.c b/tree.c index e62219803..676e9f710 100644 --- a/tree.c +++ b/tree.c @@ -52,7 +52,8 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, struct tree_desc desc; struct name_entry entry; unsigned char sha1[20]; - int len, retval = 0, oldlen = base->len; + int len, oldlen = base->len; + enum interesting retval = entry_not_interesting; if (parse_tree(tree)) return -1; @@ -60,11 +61,11 @@ static int read_tree_1(struct tree *tree, struct strbuf *base, init_tree_desc(&desc, tree->buffer, tree->size); while (tree_entry(&desc, &entry)) { - if (retval != 2) { + if (retval != all_entries_interesting) { retval = tree_entry_interesting(&entry, base, 0, pathspec); - if (retval < 0) + if (retval == all_entries_not_interesting) break; - if (retval == 0) + if (retval == entry_not_interesting) continue; }