Sync with maint

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 68c1e547c244e09f6447c361b9c665efbb27192d..178e3409b7f8e0477e1a41e3575bcf886c6d664b 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -641,7 +641,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
        pl = red = pack_list_difference(local_packs, min);
        while (pl) {
                printf("%s\n%s\n",
-                      sha1_pack_index_name(pl->pack->sha1),
+                      sha1_pack_index_name(pl->pack->hash),
                       pl->pack->pack_name);
                pl = pl->next;
        }