kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2019-06-20 03:40:54 -04:00 committed by Junio C Hamano
parent 6d79e5ecb3
commit 62b89d43e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upload-pack.c
View File

@ -528,13 +528,13 @@ static int get_reachable_list(struct object_array *src,
return -1; return -1;


while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) { while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
struct object_id sha1; struct object_id oid;
const char *p; const char *p;


if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n') if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n')
break; break;


o = lookup_object(the_repository, sha1.hash); o = lookup_object(the_repository, oid.hash);
if (o && o->type == OBJ_COMMIT) { if (o && o->type == OBJ_COMMIT) {
o->flags &= ~TMP_MARK; o->flags &= ~TMP_MARK;
} }