mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/update-index: simplify parsing of cacheinfo

Browse Source 
Switch from using get_oid_hex to parse_oid_hex to simplify pointer
operations and avoid the need for a hash-related 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
2018-07-16 01:28:01 +00:00
committed by Junio C Hamano
parent 1928c9449e
commit fe04ccf7ca
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/update-index.c
View File

@ -827,6 +827,7 @@ static int parse_new_style_cacheinfo(const char *arg,
{ {
unsigned long ul; unsigned long ul;
char *endp; char *endp;
const char *p;
if (!arg) if (!arg)
return -1; return -1;
@ -837,9 +838,9 @@ static int parse_new_style_cacheinfo(const char *arg,
return -1; /* not a new-style cacheinfo */ return -1; /* not a new-style cacheinfo */
*mode = ul; *mode = ul;
endp++; endp++;
if (get_oid_hex(endp, oid) || endp[GIT_SHA1_HEXSZ] != ',') if (parse_oid_hex(endp, oid, &p) || *p != ',')
return -1; return -1;
*path = endp + GIT_SHA1_HEXSZ + 1; *path = p + 1;
return 0; return 0;
} }