summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorHu Jialun <hujialun@comp.nus.edu.sg>2021-07-09 18:07:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-09 19:04:51 (GMT)
commit54ba2f1862df7144eb3a8b192d992b520bdc3743 (patch)
tree90b5d1921ba44502a0afbcbd383fd8a31072dcbb /builtin/commit.c
parentebf3c04b262aa27fbb97f8a0156c2347fecafafb (diff)
downloadgit-54ba2f1862df7144eb3a8b192d992b520bdc3743.zip
git-54ba2f1862df7144eb3a8b192d992b520bdc3743.tar.gz
git-54ba2f1862df7144eb3a8b192d992b520bdc3743.tar.bz2
commit: reorganise commit hint strings
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 <gitster@pobox.com> Helped-by: Đoàn Trần Công Danh <congdanhqx@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.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 190d215..e68d139 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