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

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

diff --git a/builtin/commit.c b/builtin/commit.c
index 69ac78d5e524f49e5da993e16cf3b74cf080926e..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;
@@ -847,21 +847,19 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                        if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
                                !merge_contains_scissors)
                                wt_status_add_cut_line(s->fp);
-                       status_printf_ln(s, GIT_COLOR_NORMAL,
-                           whence == FROM_MERGE
-                               ? _("\n"
-                                       "It looks like you may be committing a merge.\n"
-                                       "If this is not correct, please remove the file\n"
-                                       "       %s\n"
-                                       "and try again.\n")
-                               : _("\n"
-                                       "It looks like you may be committing a cherry-pick.\n"
-                                       "If this is not correct, please remove the file\n"
-                                       "       %s\n"
-                                       "and try again.\n"),
+                       status_printf_ln(
+                               s, GIT_COLOR_NORMAL,
                                whence == FROM_MERGE ?
-                                       git_path_merge_head(the_repository) :
-                                       git_path_cherry_pick_head(the_repository));
+                                             _("\n"
+                                         "It looks like you may be committing a merge.\n"
+                                         "If this is not correct, please run\n"
+                                         "     git update-ref -d MERGE_HEAD\n"
+                                         "and try again.\n") :
+                                             _("\n"
+                                         "It looks like you may be committing a cherry-pick.\n"
+                                         "If this is not correct, please run\n"
+                                         "     git update-ref -d CHERRY_PICK_HEAD\n"
+                                         "and try again.\n"));
                }
 
                fprintf(s->fp, "\n");
@@ -1243,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();
 
@@ -1586,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.  */
@@ -1674,8 +1672,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        }
 
        if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
-                                parents, &oid, author_ident.buf, sign_commit,
-                                extra)) {
+                                parents, &oid, author_ident.buf, NULL,
+                                sign_commit, extra)) {
                rollback_index_files();
                die(_("failed to write commit object"));
        }
@@ -1702,7 +1700,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        git_test_write_commit_graph_or_die();
 
        repo_rerere(the_repository, 0);
-       run_auto_gc(quiet);
+       run_auto_maintenance(quiet);
        run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
        if (amend && !no_post_rewrite) {
                commit_post_rewrite(the_repository, current_head, &oid);