packfile: convert has_sha1_pack to object_id

bk2204 · gitster · commit 14c3c80c8141 · 2018-05-02T13:59:49.000+09:00
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 &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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)
diff --git a/diff.c b/diff.c
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static int count_loose(const struct object_id oid, const char path, void *data`
`66`	`66`	`else {`
`67`	`67`	`loose_size += on_disk_bytes(st);`
`68`	`68`	`loose++;`
`69`		`- if (verbose && has_sha1_pack(oid->hash))`
	`69`	`+ if (verbose && has_object_pack(oid))`
`70`	`70`	`packed_loose++;`
`71`	`71`	`}`
`72`	`72`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ static int prune_object(const struct object_id oid, const char path,`
`25`	`25`	`{`
`26`	`26`	`int *opts = data;`
`27`	`27`
`28`		`- if (!has_sha1_pack(oid->hash))`
	`28`	`+ if (!has_object_pack(oid))`
`29`	`29`	`return 0;`
`30`	`30`
`31`	`31`	`if (*opts & PRUNE_PACKED_DRY_RUN)`
Original file line number	Diff line number	Diff line change
`@@ -1854,10 +1854,10 @@ int find_pack_entry(struct repository r, const unsigned char sha1, struct pack`
`1854`	`1854`	`return 0;`
`1855`	`1855`	`}`
`1856`	`1856`
`1857`		`-int has_sha1_pack(const unsigned char *sha1)`
	`1857`	`+int has_object_pack(const struct object_id *oid)`
`1858`	`1858`	`{`
`1859`	`1859`	`struct pack_entry e;`
`1860`		`- return find_pack_entry(the_repository, sha1, &e);`
	`1860`	`+ return find_pack_entry(the_repository, oid->hash, &e);`
`1861`	`1861`	`}`
`1862`	`1862`
`1863`	`1863`	`int has_pack_index(const unsigned char *sha1)`
Original file line number	Diff line number	Diff line change
`@@ -3086,7 +3086,7 @@ enum commit_action get_commit_action(struct rev_info revs, struct commit commi`
`3086`	`3086`	`{`
`3087`	`3087`	`if (commit->object.flags & SHOWN)`
`3088`	`3088`	`return commit_ignore;`
`3089`		`- if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))`
	`3089`	`+ if (revs->unpacked && has_object_pack(&commit->object.oid))`
`3090`	`3090`	`return commit_ignore;`
`3091`	`3091`	`if (commit->object.flags & UNINTERESTING)`
`3092`	`3092`	`return commit_ignore;`