Ayush Chandekar <ayu.chandekar@xxxxxxxxx> writes: > If conflict comments already use a comment character that isn't "#", and > ... > The patch text is based on Phillip Wood's message: > https://lore.kernel.org/git/9e96aaab-79a2-4632-94cd-d016d4a63b30@xxxxxxxxx/ > and the commit log message is wriiten by me. > > Based-on-a-patch-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > Mentored-by: Christian Couder <christian.couder@xxxxxxxxx> > Mentored-by: Ghanshyam Thakkar <shyamthakkar001@xxxxxxxxx> > Signed-off-by: Ayush Chandekar <ayu.chandekar@xxxxxxxxx> > --- Earlier in response to your "Phillip should actually get the primary credit" I said to ask for his sign-off, because I took it as you are actually making Phillip the author of the patch. But it is fine either way. Phillip has given his permission to add a sign-off, so we have everything to move this topic forward. Thanks, all! > config.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/config.c b/config.c > index eb60c293ab..bb75bdc65d 100644 > --- a/config.c > +++ b/config.c > @@ -1537,9 +1537,11 @@ static int git_default_core_config(const char *var, const char *value, > !strcmp(var, "core.commentstring")) { > if (!value) > return config_error_nonbool(var); > - else if (!strcasecmp(value, "auto")) > + else if (!strcasecmp(value, "auto")) { > auto_comment_line_char = 1; > - else if (value[0]) { > + FREE_AND_NULL(comment_line_str_to_free); > + comment_line_str = "#"; > + } else if (value[0]) { > if (strchr(value, '\n')) > return error(_("%s cannot contain newline"), var); > comment_line_str = value;
