From 54ba2f1862df7144eb3a8b192d992b520bdc3743 Mon Sep 17 00:00:00 2001 From: Hu Jialun Date: Sat, 10 Jul 2021 02:07:31 +0800 Subject: commit: reorganise commit hint strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Strings of hint messages inserted into editor on interactive commit was scattered in-line, rendering the code harder to understand at first glance. Extract those messages out into separate variables to make the code outline easier to follow. Helped-by: Junio C Hamano Helped-by: Đoàn Trần Công Danh Signed-off-by: Hu Jialun Signed-off-by: Junio C Hamano --- builtin/commit.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'builtin') diff --git a/builtin/commit.c b/builtin/commit.c index 190d215d43..e68d139dee 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -889,6 +889,14 @@ 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"); if (whence != FROM_COMMIT) { if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS && @@ -911,20 +919,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix, fprintf(s->fp, "\n"); if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL) - status_printf(s, GIT_COLOR_NORMAL, - _("Please enter the commit message for your changes." - " Lines starting\nwith '%c' will be ignored, and an empty" - " message aborts the commit.\n"), comment_line_char); + status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_all, comment_line_char); else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) { if (whence == FROM_COMMIT && !merge_contains_scissors) wt_status_add_cut_line(s->fp); } else /* COMMIT_MSG_CLEANUP_SPACE, that is. */ - status_printf(s, GIT_COLOR_NORMAL, - _("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"), comment_line_char); + status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_space, comment_line_char); /* * These should never fail because they come from our own -- cgit v1.2.3 From 6f70f00b4f94c036767cbe0f4cd23db573a4e8ba Mon Sep 17 00:00:00 2001 From: Hu Jialun Date: Sat, 10 Jul 2021 02:07:32 +0800 Subject: commit: remove irrelavent prompt on `--allow-empty-message` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Helped-by: Đoàn Trần Công Danh Helped-by: Felipe Contreras Signed-off-by: Hu Jialun Signed-off-by: Junio C Hamano --- builtin/commit.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'builtin') diff --git a/builtin/commit.c b/builtin/commit.c index e68d139dee..cfbc83751a 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) -- cgit v1.2.3