From ea9882bfc4d2850b65eac29ac5152e0d778a744b Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 12 Sep 2013 12:50:06 +0200 Subject: [PATCH] commit: disable status hints when writing to COMMIT_EDITMSG This turns the template COMMIT_EDITMSG from e.g # [...] # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: builtin/commit.c # # Untracked files: # (use "git add ..." to include in what will be committed) # # t/foo # to # [...] # Changes to be committed: # modified: builtin/commit.c # # Untracked files: # t/foo # Most status hints were written to be accurate when running "git status" before running a commit. Many of them are not applicable when the commit has already been started, and should not be shown in COMMIT_EDITMSG. The most obvious are hints advising to run "git commit", "git rebase/am/cherry-pick --continue", which do not make sense when the command has already been run. Other messages become slightly inaccurate (e.g. hint to use "git add" to add untracked files), as the suggested commands are not immediately applicable during the editing of COMMIT_EDITMSG, but would be applicable if the commit is aborted. These messages are both potentially helpful and slightly misleading. This patch chose to remove them too, to avoid introducing too much complexity in the status code. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- builtin/commit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builtin/commit.c b/builtin/commit.c index 28c6309d46..321462a435 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -705,6 +705,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (s->fp == NULL) die_errno(_("could not open '%s'"), git_path(commit_editmsg)); + /* + * Most hints are counter-productive when the commit has + * already started. + */ + s->hints = 0; + if (clean_message_contents) stripspace(&sb, 0); -- 2.11.4.GIT