Merge branch 'js/ghwf-setup-msbuild-update'

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

diff --git a/builtin/commit.c b/builtin/commit.c
index 42b964e0cacd506203c3610e8830419dec11f260..1dfd799ec5185928f327d2cdd3156b41d6c0199e 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -326,7 +326,7 @@ static void refresh_cache_or_die(int refresh_flags)
                die_resolve_conflict("commit");
 }
 
-static const char *prepare_index(int argc, const char **argv, const char *prefix,
+static const char *prepare_index(const char **argv, const char *prefix,
                                 const struct commit *current_head, int is_status)
 {
        struct string_list partial = STRING_LIST_INIT_DUP;
@@ -378,7 +378,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
                old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
                setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
 
-               if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
+               if (interactive_add(argv, prefix, patch_interactive) != 0)
                        die(_("interactive add failed"));
 
                the_repository->index_file = old_repo_index_file;
@@ -1241,13 +1241,13 @@ static int parse_and_validate_options(int argc, const char *argv[],
        return argc;
 }
 
-static int dry_run_commit(int argc, const char **argv, const char *prefix,
+static int dry_run_commit(const char **argv, const char *prefix,
                          const struct commit *current_head, struct wt_status *s)
 {
        int committable;
        const char *index_file;
 
-       index_file = prepare_index(argc, argv, prefix, current_head, 1);
+       index_file = prepare_index(argv, prefix, current_head, 1);
        committable = run_status(stdout, index_file, prefix, 0, s);
        rollback_index_files();
 
@@ -1584,8 +1584,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
 
        if (dry_run)
-               return dry_run_commit(argc, argv, prefix, current_head, &s);
-       index_file = prepare_index(argc, argv, prefix, current_head, 0);
+               return dry_run_commit(argv, prefix, current_head, &s);
+       index_file = prepare_index(argv, prefix, current_head, 0);
 
        /* Set up everything for writing the commit object.  This includes
           running hooks, writing the trees, and interacting with the user.  */