diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:49 +0900 |
| commit | 14c3c80c81418e00ee990a88f526ac851411f422 (patch) | |
| tree | 31c3912c6769a4666d80e368cb1280ab4426b0fa | |
| parent | c51c39418bb754c7884be4d7dcef93ecab967c40 (diff) | |
| download | git-14c3c80c81418e00ee990a88f526ac851411f422.tar.gz | |
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>
| -rw-r--r-- | builtin/count-objects.c | 2 | ||||
| -rw-r--r-- | builtin/fsck.c | 2 | ||||
| -rw-r--r-- | builtin/prune-packed.c | 2 | ||||
| -rw-r--r-- | diff.c | 2 | ||||
| -rw-r--r-- | packfile.c | 4 | ||||
| -rw-r--r-- | packfile.h | 2 | ||||
| -rw-r--r-- | revision.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/builtin/count-objects.c b/builtin/count-objects.c index b054713e1a..d51e2ce1ec 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 087360a675..3eb82ac44f 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 419238171d..4ff525e50f 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) @@ -3472,7 +3472,7 @@ static int reuse_worktree_file(const char *name, const struct object_id *oid, in * objects however would tend to be slower as they need * to be individually opened and inflated. */ - if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(oid->hash)) + if (!FAST_WORKING_DIRECTORY && !want_file && has_object_pack(oid)) return 0; /* diff --git a/packfile.c b/packfile.c index 5c219d0229..e65f943664 100644 --- a/packfile.c +++ b/packfile.c @@ -1854,10 +1854,10 @@ int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack return 0; } -int has_sha1_pack(const unsigned char *sha1) +int has_object_pack(const struct object_id *oid) { struct pack_entry e; - return find_pack_entry(the_repository, sha1, &e); + return find_pack_entry(the_repository, oid->hash, &e); } int has_pack_index(const unsigned char *sha1) diff --git a/packfile.h b/packfile.h index a92c0b241c..14ca34bcbd 100644 --- a/packfile.h +++ b/packfile.h @@ -136,7 +136,7 @@ extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1); */ extern int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e); -extern int has_sha1_pack(const unsigned char *sha1); +extern int has_object_pack(const struct object_id *oid); extern int has_pack_index(const unsigned char *sha1); diff --git a/revision.c b/revision.c index b42c836d7a..ce0e7b71f2 100644 --- a/revision.c +++ b/revision.c @@ -3086,7 +3086,7 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi { if (commit->object.flags & SHOWN) return commit_ignore; - if (revs->unpacked && has_sha1_pack(commit->object.oid.hash)) + if (revs->unpacked && has_object_pack(&commit->object.oid)) return commit_ignore; if (commit->object.flags & UNINTERESTING) return commit_ignore; |