Merge branch 'maint'

diff --git a/pack-redundant.c b/pack-redundant.c
index 06173206f09a39b2d9d572d7842f66674264964d..f5cd0ac59e5794a375172b998399a546eaef4ab1 100644 (file)
--- a/pack-redundant.c
+++ b/pack-redundant.c
@@ -81,7 +81,7 @@ static struct llist * llist_copy(struct llist *list)
 {
        struct llist *ret;
        struct llist_item *new, *old, *prev;
-       
+
        llist_init(&ret);
 
        if ((ret->size = list->size) == 0)
@@ -100,7 +100,7 @@ static struct llist * llist_copy(struct llist *list)
        }
        new->next = NULL;
        ret->back = new;
-       
+
        return ret;
 }
 
@@ -550,7 +550,7 @@ static struct pack_list * add_pack(struct packed_git *p)
        l.pack = p;
        llist_init(&l.all_objects);
 
-       if (!p->index_data && open_pack_index(p))
+       if (open_pack_index(p))
                return NULL;
 
        base = p->index_data;