Merge branch 'maint'

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 795aba087fe9c6ce0e644526d662a561b7f13f31..5ae0366bc8cfe52f226c2af151a66d39b9df02aa 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -140,11 +140,10 @@ static int traverse_reachable(void)
        int result = 0;
        while (pending.nr) {
                struct object_array_entry *entry;
-               struct object *obj, *parent;
+               struct object *obj;
 
                entry = pending.objects + --pending.nr;
                obj = entry->item;
-               parent = (struct object *) entry->name;
                result |= traverse_one_object(obj);
        }
        return !!result;