summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-07-28 20:25:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-28 22:02:18 (GMT)
commitc972bf4cf546a56fe1c54ddde1d33ebb9f454a0f (patch)
tree3a97c304c0e0ed4656cc5049ba44b4eb26e87a16 /merge.c
parentef8d7ac42a6a62d678166fe25ea743315809d2bb (diff)
downloadgit-c972bf4cf546a56fe1c54ddde1d33ebb9f454a0f.zip
git-c972bf4cf546a56fe1c54ddde1d33ebb9f454a0f.tar.gz
git-c972bf4cf546a56fe1c54ddde1d33ebb9f454a0f.tar.bz2
strvec: convert remaining callers away from argv_array name
We eventually want to drop the argv_array name and just use strvec consistently. There's no particular reason we have to do it all at once, or care about interactions between converted and unconverted bits. Because of our preprocessor compat layer, the names are interchangeable to the compiler (so even a definition and declaration using different names is OK). This patch converts all of the remaining files, as the resulting diff is reasonably sized. The conversion was done purely mechanically with: git ls-files '*.c' '*.h' | xargs perl -i -pe ' s/ARGV_ARRAY/STRVEC/g; s/argv_array/strvec/g; ' We'll deal with any indentation/style fallouts separately. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/merge.c b/merge.c
index aa36de2..a05b054 100644
--- a/merge.c
+++ b/merge.c
@@ -19,22 +19,22 @@ int try_merge_command(struct repository *r,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes)
{
- struct argv_array args = ARGV_ARRAY_INIT;
+ struct strvec args = STRVEC_INIT;
int i, ret;
struct commit_list *j;
- argv_array_pushf(&args, "merge-%s", strategy);
+ strvec_pushf(&args, "merge-%s", strategy);
for (i = 0; i < xopts_nr; i++)
- argv_array_pushf(&args, "--%s", xopts[i]);
+ strvec_pushf(&args, "--%s", xopts[i]);
for (j = common; j; j = j->next)
- argv_array_push(&args, merge_argument(j->item));
- argv_array_push(&args, "--");
- argv_array_push(&args, head_arg);
+ strvec_push(&args, merge_argument(j->item));
+ strvec_push(&args, "--");
+ strvec_push(&args, head_arg);
for (j = remotes; j; j = j->next)
- argv_array_push(&args, merge_argument(j->item));
+ strvec_push(&args, merge_argument(j->item));
ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
- argv_array_clear(&args);
+ strvec_clear(&args);
discard_index(r->index);
if (repo_read_index(r) < 0)