summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-06-20 07:40:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-20 16:32:54 (GMT)
commit62b89d43e2eab692aaa65393de901e4119eddbb8 (patch)
tree6714122869437a6ed36921e91e8f5133c968eceb /upload-pack.c
parent6d79e5ecb342586466e0321487f08f17cbccb2bb (diff)
downloadgit-62b89d43e2eab692aaa65393de901e4119eddbb8.zip
git-62b89d43e2eab692aaa65393de901e4119eddbb8.tar.gz
git-62b89d43e2eab692aaa65393de901e4119eddbb8.tar.bz2
upload-pack: rename a "sha1" variable to "oid"
This variable is a "struct object_id", but uses the old-style name "sha1". Let's call it oid to match more modern code (and make it clear that it can handle any algorithm, since it uses parse_oid_hex() properly). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 4d2129e..d9a62ad 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.hash);
if (o && o->type == OBJ_COMMIT) {
o->flags &= ~TMP_MARK;
}