summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorHu Jialun <hujialun@comp.nus.edu.sg>2021-07-09 18:07:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-09 19:08:18 (GMT)
commit6f70f00b4f94c036767cbe0f4cd23db573a4e8ba (patch)
tree0f261220ea7f1e0b2d8866d94c158b2efbd5da1e /builtin/commit.c
parent54ba2f1862df7144eb3a8b192d992b520bdc3743 (diff)
downloadgit-6f70f00b4f94c036767cbe0f4cd23db573a4e8ba.zip
git-6f70f00b4f94c036767cbe0f4cd23db573a4e8ba.tar.gz
git-6f70f00b4f94c036767cbe0f4cd23db573a4e8ba.tar.bz2
commit: remove irrelavent prompt on `--allow-empty-message`
Even when the `--allow-empty-message` option is given, "git commit" offers an interactive editor session with prefilled message that says the commit will be aborted if the buffer is emptied, which is wrong. Remove the "an empty message aborts" part from the message when the option is given to fix it. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Helped-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Hu Jialun <hujialun@comp.nus.edu.sg> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index e68d139..cfbc837 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -889,15 +889,22 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
int ident_shown = 0;
int saved_color_setting;
struct ident_split ci, ai;
- const char *hint_cleanup_all = _("Please enter the commit message for your changes."
- " Lines starting\nwith '%c' will be ignored,"
- " and an empty message aborts the commit.\n");
- const char *hint_cleanup_space = _("Please enter the commit message for your changes."
- " Lines starting\n"
- "with '%c' will be kept; you may remove them"
- " yourself if you want to.\n"
- "An empty message aborts the commit.\n");
-
+ const char *hint_cleanup_all = allow_empty_message ?
+ _("Please enter the commit message for your changes."
+ " Lines starting\nwith '%c' will be ignored.\n") :
+ _("Please enter the commit message for your changes."
+ " Lines starting\nwith '%c' will be ignored, and an empty"
+ " message aborts the commit.\n");
+ const char *hint_cleanup_space = allow_empty_message ?
+ _("Please enter the commit message for your changes."
+ " Lines starting\n"
+ "with '%c' will be kept; you may remove them"
+ " yourself if you want to.\n") :
+ _("Please enter the commit message for your changes."
+ " Lines starting\n"
+ "with '%c' will be kept; you may remove them"
+ " yourself if you want to.\n"
+ "An empty message aborts the commit.\n");
if (whence != FROM_COMMIT) {
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
!merge_contains_scissors)