diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:17:20 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:17:20 +0900 |
commit | babe3f45019ecfde96339b773036d4288a1819da (patch) | |
tree | 34dece0e3d2bc84b23f21d0f9b94a9a5780cd73c /builtin/replace.c | |
parent | 06f1b8df6f3f90746c8ed50296e467e540531d8f (diff) | |
download | git-babe3f45019ecfde96339b773036d4288a1819da.tar.gz git-babe3f45019ecfde96339b773036d4288a1819da.tar.bz2 git-babe3f45019ecfde96339b773036d4288a1819da.zip |
Imported Upstream version 2.29.0upstream/2.29.0
Diffstat (limited to 'builtin/replace.c')
-rw-r--r-- | builtin/replace.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index b36d17a6..cd487659 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -228,13 +228,13 @@ static int export_object(const struct object_id *oid, enum object_type type, if (fd < 0) return error_errno(_("unable to open %s for writing"), filename); - argv_array_push(&cmd.args, "--no-replace-objects"); - argv_array_push(&cmd.args, "cat-file"); + strvec_push(&cmd.args, "--no-replace-objects"); + strvec_push(&cmd.args, "cat-file"); if (raw) - argv_array_push(&cmd.args, type_name(type)); + strvec_push(&cmd.args, type_name(type)); else - argv_array_push(&cmd.args, "-p"); - argv_array_push(&cmd.args, oid_to_hex(oid)); + strvec_push(&cmd.args, "-p"); + strvec_push(&cmd.args, oid_to_hex(oid)); cmd.git_cmd = 1; cmd.out = fd; @@ -502,7 +502,7 @@ static int convert_graft_file(int force) const char *graft_file = get_graft_file(the_repository); FILE *fp = fopen_or_warn(graft_file, "r"); struct strbuf buf = STRBUF_INIT, err = STRBUF_INIT; - struct argv_array args = ARGV_ARRAY_INIT; + struct strvec args = STRVEC_INIT; if (!fp) return -1; @@ -512,10 +512,10 @@ static int convert_graft_file(int force) if (*buf.buf == '#') continue; - argv_array_split(&args, buf.buf); - if (args.argc && create_graft(args.argc, args.argv, force, 1)) + strvec_split(&args, buf.buf); + if (args.nr && create_graft(args.nr, args.v, force, 1)) strbuf_addf(&err, "\n\t%s", buf.buf); - argv_array_clear(&args); + strvec_clear(&args); } fclose(fp); |