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

Re: [PATCH 1/2] config: be strict on core.commentChar

From
Junio C Hamano <gitster@pobox.com>
Date
May 16, 2014, 17:36 UTC
Message-ID
<xmqqsio9aank.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140516162508.GA12314@google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 43 quoted lines
> Nguyễn Thái Ngọc Duy wrote:
>
>> --- a/config.c
>> +++ b/config.c
>> @@ -826,8 +826,12 @@ static int git_default_core_config(const char *var, const char *value)
>>  	if (!strcmp(var, "core.commentchar")) {
>>  		const char *comment;
>>  		int ret = git_config_string(&comment, var, value);
>> -		if (!ret)
>> -			comment_line_char = comment[0];
>> +		if (!ret) {
>> +			if (comment[0] && !comment[1])
>> +				comment_line_char = comment[0];
>> +			else
>> +				return error("core.commentChar should only be one character");
>> +		}
>
> Perhaps, to decrease indentation a little:
>
> 		if (ret)
> 			return ret;
> 		if (comment[0] && !comment[1])
> 			comment_line_char = comment[0];
> 		else
> 			return error(...);
> 		return 0;
>
> [...]
>> --- a/t/t7508-status.sh
>> +++ b/t/t7508-status.sh
>> @@ -1348,12 +1348,6 @@ test_expect_success "status (core.commentchar with submodule summary)" '
>>  	test_i18ncmp expect output
>>  '
>>  
>> -test_expect_success "status (core.commentchar with two chars with submodule summary)" '
>> -	test_config core.commentchar ";;" &&
>> -	git -c status.displayCommentPrefix=true status >output &&
>> -	test_i18ncmp expect output
>
> Could keep the test to avoid regressions:
>
> 	test_config core.commentchar ";;" &&
> 	test_must_fail git -c status.displayCommentPrefix=true status
All good points, including your other review message.
Previous: Jonathan NiederNext: Nguyễn Thái Ngọc Duy
Message 12 of 17 in “Fwd: [Bug] - Processing commit message after amend”
  1. Michal StasaMay 16, 2014
  2. Duy NguyenMay 16, 2014
  3. Michal StasaMay 16, 2014
  4. commit: switch core.commentChar if it's found in existing commitNguyễn Thái Ngọc Duy, May 16, 2014
  5. 1/2 config: be strict on core.commentCharNguyễn Thái Ngọc Duy, May 16, 2014
  6. 2/2 commit: allow core.commentChar=auto for character auto selectionNguyễn Thái Ngọc Duy, May 16, 2014
  7. Jonathan NiederMay 16, 2014
  8. Junio C HamanoMay 16, 2014
  9. Duy NguyenMay 16, 2014
  10. Felipe ContrerasMay 16, 2014
  11. Jonathan NiederMay 16, 2014
  12. Junio C HamanoMay 16, 2014
  13. 1/2 config: be strict on core.commentCharNguyễn Thái Ngọc Duy, May 17, 2014
  14. 2/2 commit: allow core.commentChar=auto for character auto selectionNguyễn Thái Ngọc Duy, May 17, 2014
  15. Junio C HamanoMay 16, 2014
  16. Junio C HamanoMay 16, 2014
  17. David KastrupMay 16, 2014

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.