From: Junio C Hamano <gitster@pobox.com>
To: Hu Jialun <hujialun@comp.nus.edu.sg>
Cc: git@vger.kernel.org, "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: Re: [PATCH v3 1/2] commit: reorganise commit hint strings
Date: Fri, 09 Jul 2021 12:14:34 -0700 [thread overview]
Message-ID: <xmqqzguv5mg5.fsf@gitster.g> (raw)
In-Reply-To: 20210709180732.2678818-1-hujialun@comp.nus.edu.sg
Hu Jialun <hujialun@comp.nus.edu.sg> writes:
> 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>
> ---
> builtin/commit.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> 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");
That would easily make lines that are overly long. Perhaps fold
them like so?
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");
next prev parent reply other threads:[~2021-07-09 19:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 2:24 [PATCH] commit: remove irrelavent prompt on `--allow-empty-message` Hu Jialun
2021-07-06 15:44 ` Junio C Hamano
2021-07-07 4:37 ` Felipe Contreras
2021-07-07 10:43 ` Hu Jialun
2021-07-07 16:23 ` Hu Jialun
2021-07-07 16:23 ` [PATCH v2 1/2] commit: reorganise duplicate commit prompt strings Hu Jialun
2021-07-07 16:57 ` Đoàn Trần Công Danh
2021-07-07 17:44 ` Junio C Hamano
2021-07-07 16:23 ` [PATCH v2 2/2] commit: remove irrelavent prompt on `--allow-empty-message` Hu Jialun
2021-07-07 17:42 ` Felipe Contreras
2021-07-08 15:19 ` [PATCH] " Hu Jialun
2021-07-08 16:05 ` Đoàn Trần Công Danh
2021-07-08 18:26 ` Junio C Hamano
2021-07-09 18:07 ` [PATCH v3 1/2] commit: reorganise commit hint strings Hu Jialun
2021-07-09 19:14 ` Junio C Hamano [this message]
2021-07-09 18:07 ` [PATCH v3 2/2] commit: remove irrelavent prompt on `--allow-empty-message` Hu Jialun
2021-07-09 19:14 ` Junio C Hamano
2021-07-10 17:26 ` Hu Jialun
2021-07-22 18:33 ` Hu Jialun
2021-07-22 21:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzguv5mg5.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=congdanhqx@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=hujialun@comp.nus.edu.sg \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).