Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index ab35b65b073e9bc089fcc96f295ca3bc457c992a..38b033fd711ac7428bea6e56eddef18d875befd3 100644 (file)
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -61,7 +61,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
                hex[40] = 0;
                if (get_sha1_hex(hex, sha1))
                        die("internal error");
-               if (has_sha1_pack(sha1, NULL))
+               if (has_sha1_pack(sha1))
                        (*packed_loose)++;
        }
 }