summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:43 (GMT)
commita7db4c193d98f701eda0328dbf69b36f28dd22d3 (patch)
tree653e22bcdb1c8bfccb5153426910fa0bfb7d715d /upload-pack.c
parenta4c8352e1e13d362b2c09c94975fcd17639ff2a0 (diff)
parentd40abc8e95f75b529feb140178b69a3783c2d108 (diff)
downloadgit-a7db4c193d98f701eda0328dbf69b36f28dd22d3.zip
git-a7db4c193d98f701eda0328dbf69b36f28dd22d3.tar.gz
git-a7db4c193d98f701eda0328dbf69b36f28dd22d3.tar.bz2
Merge branch 'jk/oidhash'
Code clean-up to remove hardcoded SHA-1 hash from many places. * jk/oidhash: hashmap: convert sha1hash() to oidhash() hash.h: move object_id definition from cache.h khash: rename oid helper functions khash: drop sha1-specific map types pack-bitmap: convert khash_sha1 maps into kh_oid_map delta-islands: convert island_marks khash to use oids khash: rename kh_oid_t to kh_oid_set khash: drop broken oid_map typedef object: convert create_object() to use object_id object: convert internal hash_obj() to object_id object: convert lookup_object() to use object_id object: convert lookup_unknown_object() to use object_id pack-objects: convert locate_object_entry_hash() to object_id pack-objects: convert packlist_find() to use object_id pack-bitmap-write: convert some helpers to use object_id upload-pack: rename a "sha1" variable to "oid" describe: fix accidental oid/hash type-punning
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/upload-pack.c b/upload-pack.c
index b2a9f36..222cd3a 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -528,13 +528,13 @@ static int get_reachable_list(struct object_array *src,
return -1;
while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
- struct object_id sha1;
+ struct object_id oid;
const char *p;
- if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
+ if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
break;
- o = lookup_object(the_repository, sha1.hash);
+ o = lookup_object(the_repository, &oid);
if (o && o->type == OBJ_COMMIT) {
o->flags &= ~TMP_MARK;
}
@@ -960,7 +960,7 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
static int mark_our_ref(const char *refname, const char *refname_full,
const struct object_id *oid)
{
- struct object *o = lookup_unknown_object(oid->hash);
+ struct object *o = lookup_unknown_object(oid);
if (ref_is_hidden(refname, refname_full)) {
o->flags |= HIDDEN_REF;