diff options
Diffstat (limited to 'third_party/git/builtin/replace.c')
| -rw-r--r-- | third_party/git/builtin/replace.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/third_party/git/builtin/replace.c b/third_party/git/builtin/replace.c index b36d17a657..644b21ca8d 100644 --- a/third_party/git/builtin/replace.c +++ b/third_party/git/builtin/replace.c @@ -272,7 +272,7 @@ static int import_object(struct object_id *oid, enum object_type type, return error(_("unable to spawn mktree")); } - if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) { + if (strbuf_read(&result, cmd.out, 41) < 0) { error_errno(_("unable to read from mktree")); close(fd); close(cmd.out); @@ -358,15 +358,14 @@ static int replace_parents(struct strbuf *buf, int argc, const char **argv) struct strbuf new_parents = STRBUF_INIT; const char *parent_start, *parent_end; int i; - const unsigned hexsz = the_hash_algo->hexsz; /* find existing parents */ parent_start = buf->buf; - parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */ + parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */ parent_end = parent_start; while (starts_with(parent_end, "parent ")) - parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */ + parent_end += 48; /* "parent " + "hex sha1" + "\n" */ /* prepare new parents */ for (i = 0; i < argc; i++) { @@ -409,8 +408,7 @@ static int check_one_mergetag(struct commit *commit, struct tag *tag; int i; - hash_object_file(the_hash_algo, extra->value, extra->len, - type_name(OBJ_TAG), &tag_oid); + hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid); tag = lookup_tag(the_repository, &tag_oid); if (!tag) return error(_("bad mergetag in commit '%s'"), ref); @@ -423,7 +421,7 @@ static int check_one_mergetag(struct commit *commit, if (get_oid(mergetag_data->argv[i], &oid) < 0) return error(_("not a valid object name: '%s'"), mergetag_data->argv[i]); - if (oideq(get_tagged_oid(tag), &oid)) + if (oideq(&tag->tagged->oid, &oid)) return 0; /* found */ } |