strvec: convert builtin/ callers away from argv_array name

[thirdparty/git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index d104d5c6889ba2d2ffaaeafa08fbfcd759d8bc92..33528fefa9de4754fce37c9f660241a10fdd22e3 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1128,18 +1128,18 @@ do_pp:
 
 static int get_notes_refs(struct string_list_item *item, void *arg)
 {
-       argv_array_pushf(arg, "--notes=%s", item->string);
+       strvec_pushf(arg, "--notes=%s", item->string);
        return 0;
 }
 
-static void get_notes_args(struct argv_array *arg, struct rev_info *rev)
+static void get_notes_args(struct strvec *arg, struct rev_info *rev)
 {
        if (!rev->show_notes) {
-               argv_array_push(arg, "--no-notes");
+               strvec_push(arg, "--no-notes");
        } else if (rev->notes_opt.use_default_notes > 0 ||
                   (rev->notes_opt.use_default_notes == -1 &&
                    !rev->notes_opt.extra_notes_refs.nr)) {
-               argv_array_push(arg, "--notes");
+               strvec_push(arg, "--notes");
        } else {
                for_each_string_list(&rev->notes_opt.extra_notes_refs, get_notes_refs, arg);
        }
@@ -1217,7 +1217,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
                 * can be added later if deemed desirable.
                 */
                struct diff_options opts;
-               struct argv_array other_arg = ARGV_ARRAY_INIT;
+               struct strvec other_arg = STRVEC_INIT;
                diff_setup(&opts);
                opts.file = rev->diffopt.file;
                opts.use_color = rev->diffopt.use_color;
@@ -1226,7 +1226,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
                get_notes_args(&other_arg, rev);
                show_range_diff(rev->rdiff1, rev->rdiff2,
                                rev->creation_factor, 1, &opts, &other_arg);
-               argv_array_clear(&other_arg);
+               strvec_clear(&other_arg);
        }
 }