Merge branch 'maint'

diff --git a/show-index.c b/show-index.c
index 63f9da53237d4233bede66a28e4bcf27d5b44af1..4c0ac138aff7b5add73e17fc9c3c4e409fd918e2 100644 (file)
--- a/show-index.c
+++ b/show-index.c
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
                        unsigned char sha1[20];
                        uint32_t crc;
                        uint32_t off;
-               } *entries = xmalloc(nr * sizeof(entries[0]));
+               } *entries = malloc(nr * sizeof(entries[0]));
                for (i = 0; i < nr; i++)
                        if (fread(entries[i].sha1, 20, 1, stdin) != 1)
                                die("unable to read sha1 %u/%u", i, nr);