summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-05-02 00:25:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-02 04:59:49 (GMT)
commit14c3c80c81418e00ee990a88f526ac851411f422 (patch)
tree31c3912c6769a4666d80e368cb1280ab4426b0fa /builtin
parentc51c39418bb754c7884be4d7dcef93ecab967c40 (diff)
downloadgit-14c3c80c81418e00ee990a88f526ac851411f422.zip
git-14c3c80c81418e00ee990a88f526ac851411f422.tar.gz
git-14c3c80c81418e00ee990a88f526ac851411f422.tar.bz2
packfile: convert has_sha1_pack to object_id
Convert this function to take a pointer to struct object_id and rename it has_object_pack for consistency with has_object_file. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/count-objects.c2
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/prune-packed.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index b054713..d51e2ce 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -66,7 +66,7 @@ static int count_loose(const struct object_id *oid, const char *path, void *data
else {
loose_size += on_disk_bytes(st);
loose++;
- if (verbose && has_sha1_pack(oid->hash))
+ if (verbose && has_object_pack(oid))
packed_loose++;
}
return 0;
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 087360a..3eb82ac 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -227,7 +227,7 @@ static void check_reachable_object(struct object *obj)
if (!(obj->flags & HAS_OBJ)) {
if (is_promisor_object(&obj->oid))
return;
- if (has_sha1_pack(obj->oid.hash))
+ if (has_object_pack(&obj->oid))
return; /* it is in pack - forget about it */
printf("missing %s %s\n", printable_type(obj),
describe_object(obj));
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index 4192381..4ff525e 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -25,7 +25,7 @@ static int prune_object(const struct object_id *oid, const char *path,
{
int *opts = data;
- if (!has_sha1_pack(oid->hash))
+ if (!has_object_pack(oid))
return 0;
if (*opts & PRUNE_PACKED_DRY_RUN)