Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
> Changes since V1:
> - Rebased onto a merge of 'ps/config-wo-the-repository' and 'master'
OK. I needed the following merge-fix to make this merge work.
diff --git w/environment.c c/environment.c
index ae1427bb9e..a0ac5934b3 100644
--- w/environment.c
+++ c/environment.c
@@ -461,9 +461,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;
I guess I used to carry an equivalent as a recurrent merge-fix for
your topic branch, but rolling it into the base of the series is
certainly safer (i.e. we have to do a merge and resolve conflicts
just once, and after that we won't even touch it---as opposed to
keep recreating the same conflict and resolving every time we merge
your topic via rerere & merge-fix mechanism).
Thanks.
