Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / builtin / remote-ext.c

diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index bfb21ba7d217bafaf3527af007cd4ac4658d36c5..fd3538d4f0e6924214bedc36c132f631d17f4c8b 100644 (file)
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -57,7 +57,7 @@ static char *strip_escapes(const char *str, const char *service,
                                special = str[rpos];
                                if (rpos == 1)
                                        break;
-                               /* Fall-through to error. */
+                               /* fallthrough */
                        default:
                                die("Bad remote-ext placeholder '%%%c'.",
                                        str[rpos]);
@@ -117,12 +117,12 @@ static char *strip_escapes(const char *str, const char *service,
        }
 }
 
-static void parse_argv(struct argv_array *out, const char *arg, const char *service)
+static void parse_argv(struct strvec *out, const char *arg, const char *service)
 {
        while (*arg) {
                char *expanded = strip_escapes(arg, service, &arg);
                if (expanded)
-                       argv_array_push(out, expanded);
+                       strvec_push(out, expanded);
                free(expanded);
        }
 }