undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-curl: make hash size independent

Browse Source 
Change one hard-coded use of the constant 40 to a reference to
the_hash_algo.  In addition, switch a use of get_oid_hex to
parse_oid_hex to avoid the need to use a constant.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2019-02-19 00:05:16 +00:00 committed by Junio C Hamano
parent 05dfc7cac4
commit 9c9492e8aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
remote-curl.c
View File

@ -249,7 +249,7 @@ static struct ref *parse_info_refs(struct discovery *heads)
if (data[i] == '\t')
mid = &data[i];
if (data[i] == '\n') {
if (mid - start != 40)
if (mid - start != the_hash_algo->hexsz)
die("%sinfo/refs not valid: is this a git repository?",
url.buf);
data[i] = 0;
@ -1107,12 +1107,13 @@ static void parse_fetch(struct strbuf *buf)
const char *name;
struct ref *ref;
struct object_id old_oid;
const char *q;
if (get_oid_hex(p, &old_oid))
if (parse_oid_hex(p, &old_oid, &q))
die("protocol error: expected sha/ref, got %s'", p);
if (p[GIT_SHA1_HEXSZ] == ' ')
name = p + GIT_SHA1_HEXSZ + 1;
else if (!p[GIT_SHA1_HEXSZ])
if (*q == ' ')
name = q + 1;
else if (!*q)
name = "";
else
die("protocol error: expected sha/ref, got %s'", p);