diff options
| author |  Jeff King <peff@peff.net> | 2019-06-20 03:40:54 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-20 09:32:54 -0700 |
| commit | 62b89d43e2eab692aaa65393de901e4119eddbb8 (patch) | |
| tree | 6714122869437a6ed36921e91e8f5133c968eceb /upload-pack.c | |
| parent | describe: fix accidental oid/hash type-punning (diff) | |
| download | tgif-62b89d43e2eab692aaa65393de901e4119eddbb8.tar.xz | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index 4d2129e7fc..d9a62adef0 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; } |