summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorHeba Waly <heba.waly@gmail.com>2019-12-17 09:17:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-19 19:58:08 (GMT)
commit5c4f55f1f62b64f530bd135e5b248ceba7b95708 (patch)
treeaa3a32da51b1a5feafaf4a22d994afc44b79b50c /builtin/commit.c
parent53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff)
downloadgit-5c4f55f1f62b64f530bd135e5b248ceba7b95708.zip
git-5c4f55f1f62b64f530bd135e5b248ceba7b95708.tar.gz
git-5c4f55f1f62b64f530bd135e5b248ceba7b95708.tar.bz2
commit: honor advice.statusHints when rejecting an empty commit
In ea9882bfc4 (commit: disable status hints when writing to COMMIT_EDITMSG, 2013-09-12) the intent was to disable status hints when writing to COMMIT_EDITMSG, because giving the hints in the "git status" like output in the commit message template are too late to be useful (they say things like "'git add' to stage", but that is only possible after aborting the current "git commit" session). But there is one case that the hints can be useful: When the current attempt to commit is rejected because no change is recorded in the index. The message is given and "git commit" errors out, so the hints can immediately be followed by the user. Teach the codepath to honor the configuration variable. Signed-off-by: Heba Waly <heba.waly@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index e588bc6..0078faf 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -944,6 +944,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
*/
if (!committable && whence != FROM_MERGE && !allow_empty &&
!(amend && is_a_merge(current_head))) {
+ s->hints = advice_status_hints;
s->display_comment_prefix = old_display_comment_prefix;
run_status(stdout, index_file, prefix, 0, s);
if (amend)