summaryrefslogtreecommitdiff
path: root/builtin-count-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-09 06:21:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-09 06:21:10 (GMT)
commitc3067cbfb3fbab32177d5f61ea73127f08ab43cb (patch)
tree0f6ee3c2d1835d591ca96df058c021b848be95b9 /builtin-count-objects.c
parent61e6108d94353d932d397e4be498c7e5293723eb (diff)
parent094085e3362c592c932b41525ed37152ec171192 (diff)
downloadgit-c3067cbfb3fbab32177d5f61ea73127f08ab43cb.zip
git-c3067cbfb3fbab32177d5f61ea73127f08ab43cb.tar.gz
git-c3067cbfb3fbab32177d5f61ea73127f08ab43cb.tar.bz2
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
* jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable Conflicts: t/t7700-repack.sh
Diffstat (limited to 'builtin-count-objects.c')
-rw-r--r--builtin-count-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index 62fd1f0..b814fe5 100644
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -60,7 +60,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)++;
}
}