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

builtin/replace: make hash size independent

Browse Source 
Instead of using GIT_SHA1_HEXSZ and hard-coded constants, switch to
using the_hash_algo.

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-08-18 20:04:02 +00:00 committed by Junio C Hamano
parent 5fa0f5238b
commit 28ba1830d0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/replace.c
View File

@ -272,7 +272,7 @@ static int import_object(struct object_id *oid, enum object_type type,
return error(_("unable to spawn mktree")); return error(_("unable to spawn mktree"));
} }
if (strbuf_read(&result, cmd.out, 41) < 0) { if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) {
error_errno(_("unable to read from mktree")); error_errno(_("unable to read from mktree"));
close(fd); close(fd);
close(cmd.out); close(cmd.out);
@ -358,14 +358,15 @@ static int replace_parents(struct strbuf *buf, int argc, const char **argv)
struct strbuf new_parents = STRBUF_INIT; struct strbuf new_parents = STRBUF_INIT;
const char *parent_start, *parent_end; const char *parent_start, *parent_end;
int i; int i;
const unsigned hexsz = the_hash_algo->hexsz;
/* find existing parents */ /* find existing parents */
parent_start = buf->buf; parent_start = buf->buf;
parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */ parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */
parent_end = parent_start; parent_end = parent_start;
while (starts_with(parent_end, "parent ")) while (starts_with(parent_end, "parent "))
parent_end += 48; /* "parent " + "hex sha1" + "\n" */ parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */
/* prepare new parents */ /* prepare new parents */
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {