list-objects.c: handle unexpected non-tree entries

Apply similar treatment as the previous commit for non-tree entries,
too.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/list-objects.c b/list-objects.c
index ea04bbdee6a938d02d46fc400471a62a553da1a1..bb7e61ef4bb9d1d48ca7840f87a301eff84f08e0 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -125,6 +125,11 @@ static void process_tree_contents(struct traversal_context *ctx,
 
                if (S_ISDIR(entry.mode)) {
                        struct tree *t = lookup_tree(ctx->revs->repo, &entry.oid);
 
                if (S_ISDIR(entry.mode)) {
                        struct tree *t = lookup_tree(ctx->revs->repo, &entry.oid);

+                       if (!t) {
+                               die(_("entry '%s' in tree %s has tree mode, "
+                                     "but is not a tree"),
+                                   entry.path, oid_to_hex(&tree->object.oid));
+                       }

                        t->object.flags |= NOT_USER_GIVEN;
                        process_tree(ctx, t, base, entry.path);
                }
                        t->object.flags |= NOT_USER_GIVEN;
                        process_tree(ctx, t, base, entry.path);
                }

diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 1377c603783f0807eea0482aa401589d84592c3b..e3ec19553292993cc21ff9d4757a3f14703e9cb3 100755 (executable)
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -34,8 +34,9 @@ test_expect_failure 'traverse unexpected non-tree entry (lone)' '
        test_must_fail git rev-list --objects $broken_tree
 '
 
        test_must_fail git rev-list --objects $broken_tree
 '
 

-test_expect_failure 'traverse unexpected non-tree entry (seen)' '
-       test_must_fail git rev-list --objects $blob $broken_tree
+test_expect_success 'traverse unexpected non-tree entry (seen)' '
+       test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
+       test_i18ngrep "is not a tree" output

 '
 
 test_expect_success 'setup unexpected non-commit parent' '
 '
 
 test_expect_success 'setup unexpected non-commit parent' '