summaryrefslogtreecommitdiff
path: root/builtin-count-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-03 22:01:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-03 22:01:31 (GMT)
commite89c6ea9988fc039a17875eb9cbdea245e96ed67 (patch)
tree2eaff9fe76a30f4ee40c3bf9bf1beca1b4e67afd /builtin-count-objects.c
parent3f3e2c26fa0325f4df952363f8f5046ca8158bb3 (diff)
parent094085e3362c592c932b41525ed37152ec171192 (diff)
downloadgit-e89c6ea9988fc039a17875eb9cbdea245e96ed67.zip
git-e89c6ea9988fc039a17875eb9cbdea245e96ed67.tar.gz
git-e89c6ea9988fc039a17875eb9cbdea245e96ed67.tar.bz2
Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1
* 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
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 ab35b65..38b033f 100644
--- 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)++;
}
}