Merge branch 'es/test-cmp-typocatcher'

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

diff --git a/builtin/commit.c b/builtin/commit.c
index d1b7396052a2449f3ebda88df62cf7b89499090f..69ac78d5e524f49e5da993e16cf3b74cf080926e 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1005,15 +1005,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                return 0;
 
        if (use_editor) {
-               struct argv_array env = ARGV_ARRAY_INIT;
+               struct strvec env = STRVEC_INIT;
 
-               argv_array_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
-               if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
+               strvec_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
+               if (launch_editor(git_path_commit_editmsg(), NULL, env.v)) {
                        fprintf(stderr,
                        _("Please supply the message using either -m or -F option.\n"));
                        exit(1);
                }
-               argv_array_clear(&env);
+               strvec_clear(&env);
        }
 
        if (!no_verify &&