undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packfile: convert has_sha1_pack to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson 2018-05-02 00:25:33 +00:00 committed by Junio C Hamano
parent c51c39418b
commit 14c3c80c81
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/count-objects.c
View File

@ -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;

2
builtin/fsck.c
View File

@ -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));

2
builtin/prune-packed.c
View File

@ -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)

2
diff.c
View File

@ -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;
/*

4
packfile.c
View File

@ -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)

2
packfile.h
View File

@ -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);

2
revision.c
View File

@ -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;