summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-28 00:37:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-28 01:06:06 -0800
commit69e020ae00ebd3f7ae3c2f35acb139361417ef64 (patch)
treee5d700170a0604ee30f3317fc93f816c6d2a1a30 /builtin-pack-objects.c
parent03a9683d22eca52bc2b2b9b09258a143e76416f6 (diff)
downloadgit-69e020ae00ebd3f7ae3c2f35acb139361417ef64.tar.gz
is_kept_pack(): final clean-up
Now is_kept_pack() is just a member lookup into a structure, we can write it as such. Also rewrite the sole caller of has_sha1_kept_pack() to switch on the criteria the callee uses (namely, revs->kept_pack_only) between calling has_sha1_kept_pack() and has_sha1_pack(), so that these two callees do not have to take a pointer to struct rev_info as an argument. This removes the header file dependency issue temporarily introduced by the earlier commit, so we revert changes associated to that as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 150258b629..b2e46264ee 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1915,7 +1915,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
const unsigned char *sha1;
struct object *o;
- if (is_kept_pack(p))
+ if (p->pack_keep)
continue;
if (open_pack_index(p))
die("cannot open pack index");
@@ -1951,7 +1951,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
const unsigned char *sha1;
for (p = packed_git; p; p = p->next) {
- if (is_kept_pack(p))
+ if (p->pack_keep)
continue;
if (open_pack_index(p))