Merge branch 'bc/hash-transition-16'
Conversion from unsigned char[20] to struct object_id continues. * bc/hash-transition-16: (35 commits) gitweb: make hash size independent Git.pm: make hash size independent read-cache: read data in a hash-independent way dir: make untracked cache extension hash size independent builtin/difftool: use parse_oid_hex refspec: make hash size independent archive: convert struct archiver_args to object_id builtin/get-tar-commit-id: make hash size independent get-tar-commit-id: parse comment record hash: add a function to lookup hash algorithm by length remote-curl: make hash size independent http: replace sha1_to_hex http: compute hash of downloaded objects using the_hash_algo http: replace hard-coded constant with the_hash_algo http-walker: replace sha1_to_hex http-push: remove remaining uses of sha1_to_hex http-backend: allow 64-character hex names http-push: convert to use the_hash_algo builtin/pull: make hash-size independent builtin/am: make hash size independent ...
This commit is contained in:
@ -65,14 +65,12 @@ static int parse_index_info(char *p, int *mode1, int *mode2,
|
||||
*mode2 = (int)strtol(p + 1, &p, 8);
|
||||
if (*p != ' ')
|
||||
return error("expected ' ', got '%c'", *p);
|
||||
if (get_oid_hex(++p, oid1))
|
||||
return error("expected object ID, got '%s'", p + 1);
|
||||
p += GIT_SHA1_HEXSZ;
|
||||
if (parse_oid_hex(++p, oid1, (const char **)&p))
|
||||
return error("expected object ID, got '%s'", p);
|
||||
if (*p != ' ')
|
||||
return error("expected ' ', got '%c'", *p);
|
||||
if (get_oid_hex(++p, oid2))
|
||||
return error("expected object ID, got '%s'", p + 1);
|
||||
p += GIT_SHA1_HEXSZ;
|
||||
if (parse_oid_hex(++p, oid2, (const char **)&p))
|
||||
return error("expected object ID, got '%s'", p);
|
||||
if (*p != ' ')
|
||||
return error("expected ' ', got '%c'", *p);
|
||||
*status = *++p;
|
||||
|
Reference in New Issue
Block a user