Imported Upstream version 2.29.0

[platform/upstream/git.git] / gpg-interface.c

diff --git a/gpg-interface.c b/gpg-interface.c
index 2d538bc..b499270 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -282,12 +282,12 @@ static int verify_signed_buffer(const char *payload, size_t payload_size,
        if (!fmt)
                BUG("bad signature '%s'", signature);
 
-       argv_array_push(&gpg.args, fmt->program);
-       argv_array_pushv(&gpg.args, fmt->verify_args);
-       argv_array_pushl(&gpg.args,
-                        "--status-fd=1",
-                        "--verify", temp->filename.buf, "-",
-                        NULL);
+       strvec_push(&gpg.args, fmt->program);
+       strvec_pushv(&gpg.args, fmt->verify_args);
+       strvec_pushl(&gpg.args,
+                    "--status-fd=1",
+                    "--verify", temp->filename.buf, "-",
+                    NULL);
 
        if (!gpg_status)
                gpg_status = &buf;
@@ -434,11 +434,11 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
        size_t i, j, bottom;
        struct strbuf gpg_status = STRBUF_INIT;
 
-       argv_array_pushl(&gpg.args,
-                        use_format->program,
-                        "--status-fd=2",
-                        "-bsau", signing_key,
-                        NULL);
+       strvec_pushl(&gpg.args,
+                    use_format->program,
+                    "--status-fd=2",
+                    "-bsau", signing_key,
+                    NULL);
 
        bottom = signature->len;