git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 1/2] commit: reorganise commit hint strings

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 9, 2021, 19:14 UTC
Message-ID
<xmqqzguv5mg5.fsf@gitster.g>
In-Reply-To
<20210709180732.2678818-1-hujialun@comp.nus.edu.sg>
Hu Jialun <hujialun@comp.nus.edu.sg> writes:
Show 30 quoted lines
> 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");
Previous: Hu JialunNext: Hu Jialun
Message 15 of 20 in “commit: remove irrelavent prompt on `--allow-empty-message`”
  1. commit: remove irrelavent prompt on `--allow-empty-message`Hu Jialun, Jul 6, 2021
  2. Junio C HamanoJul 6, 2021
  3. Felipe ContrerasJul 7, 2021
  4. Hu JialunJul 7, 2021
  5. Hu JialunJul 7, 2021
  6. 1/2 commit: reorganise duplicate commit prompt stringsHu Jialun, Jul 7, 2021
  7. Đoàn Trần Công DanhJul 7, 2021
  8. Junio C HamanoJul 7, 2021
  9. 2/2 commit: remove irrelavent prompt on `--allow-empty-message`Hu Jialun, Jul 7, 2021
  10. Felipe ContrerasJul 7, 2021
  11. Hu JialunJul 8, 2021
  12. Đoàn Trần Công DanhJul 8, 2021
  13. Junio C HamanoJul 8, 2021
  14. 1/2 commit: reorganise commit hint stringsHu Jialun, Jul 9, 2021
  15. Junio C HamanoJul 9, 2021
  16. 2/2 commit: remove irrelavent prompt on `--allow-empty-message`Hu Jialun, Jul 9, 2021
  17. Junio C HamanoJul 9, 2021
  18. Hu JialunJul 10, 2021
  19. Hu JialunJul 22, 2021
  20. Junio C HamanoJul 22, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.