# [PATCH] trailer: load config to handle core.commentChar 4 messages from 2016-04-27 to 2016-04-27. Participants: Rafal Klys, Christian Couder, Junio C Hamano, Eric Sunshine. Thread: https://gitlist.dev/t/42159 ## Rafal Klys, 2016-04-27 19:24 Subject: [PATCH] trailer: load config to handle core.commentChar Message-ID: <1461785062-23523-1-git-send-email-rafalklys@wp.pl> URL: https://gitlist.dev/e/1461785062-23523-1-git-send-email-rafalklys%40wp.pl ``` Add call to git_config(git_default_config, NULL) to update the comment_char_line from default '#' to possible different value set in core.commentChar. Signed-off-by: Rafal Klys --- trailer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/trailer.c b/trailer.c index 8e48a5c..a3700b4 100644 --- a/trailer.c +++ b/trailer.c @@ -888,6 +888,9 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str git_config(git_trailer_default_config, NULL); git_config(git_trailer_config, NULL); + /* for core.commentChar */ + git_config(git_default_config, NULL); + lines = read_input_file(file); if (in_place) -- 2.8.1.68.g625efa9.dirty ``` ## Christian Couder, 2016-04-27 20:13 Subject: Re: [PATCH] trailer: load config to handle core.commentChar Message-ID: URL: https://gitlist.dev/e/CAP8UFD1O%2BV64dr-j9bu7D1mrLxEy3zG017zdJahJTx-MUYv5Pg%40mail.gmail.com In-Reply-To: <1461785062-23523-1-git-send-email-rafalklys@wp.pl> ``` On Wed, Apr 27, 2016 at 9:24 PM, Rafal Klys wrote: > Add call to git_config(git_default_config, NULL) to update the > comment_char_line from default '#' to possible different value set in > core.commentChar. It is "comment_line_char" not "comment_char_line", but otherwise you can add "Reviewed-by: Christian Couder ". Thanks! > Signed-off-by: Rafal Klys > --- > trailer.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/trailer.c b/trailer.c > index 8e48a5c..a3700b4 100644 > --- a/trailer.c > +++ b/trailer.c > @@ -888,6 +888,9 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str > git_config(git_trailer_default_config, NULL); > git_config(git_trailer_config, NULL); > > + /* for core.commentChar */ > + git_config(git_default_config, NULL); > + > lines = read_input_file(file); > > if (in_place) > -- > 2.8.1.68.g625efa9.dirty > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ``` ## Junio C Hamano, 2016-04-27 20:31 Subject: Re: [PATCH] trailer: load config to handle core.commentChar Message-ID: URL: https://gitlist.dev/e/xmqqlh3y94l0.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Christian Couder writes: > On Wed, Apr 27, 2016 at 9:24 PM, Rafal Klys wrote: >> Add call to git_config(git_default_config, NULL) to update the >> comment_char_line from default '#' to possible different value set in >> core.commentChar. > > It is "comment_line_char" not "comment_char_line", but otherwise you > can add "Reviewed-by: Christian Couder ". > > Thanks! > >> Signed-off-by: Rafal Klys >> --- >> trailer.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/trailer.c b/trailer.c >> index 8e48a5c..a3700b4 100644 >> --- a/trailer.c >> +++ b/trailer.c >> @@ -888,6 +888,9 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str >> git_config(git_trailer_default_config, NULL); >> git_config(git_trailer_config, NULL); >> >> + /* for core.commentChar */ >> + git_config(git_default_config, NULL); >> + I can sort-of see why the original (logically) reads the configuration files twice by making two separate calls to git_config(), but I do not think we should add a third round like this patch does. Shouldn't git-trailer-default-config have a fallthru call to git-default-config instead? >> lines = read_input_file(file); >> >> if (in_place) >> -- >> 2.8.1.68.g625efa9.dirty >> >> -- >> To unsubscribe from this list: send the line "unsubscribe git" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html ``` ## Eric Sunshine, 2016-04-27 20:33 Subject: Re: [PATCH] trailer: load config to handle core.commentChar Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQWOr5rQ65RJkyJZGPjYDWMv7nhL8Pbh55KGD9wZzrDHQ%40mail.gmail.com In-Reply-To: ``` On Wed, Apr 27, 2016 at 4:31 PM, Junio C Hamano wrote: >> On Wed, Apr 27, 2016 at 9:24 PM, Rafal Klys wrote: >>> Add call to git_config(git_default_config, NULL) to update the >>> comment_char_line from default '#' to possible different value set in >>> core.commentChar. >> >>> Signed-off-by: Rafal Klys >>> --- >>> trailer.c | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/trailer.c b/trailer.c >>> index 8e48a5c..a3700b4 100644 >>> --- a/trailer.c >>> +++ b/trailer.c >>> @@ -888,6 +888,9 @@ void process_trailers(const char *file, int in_place, int trim_empty, struct str >>> git_config(git_trailer_default_config, NULL); >>> git_config(git_trailer_config, NULL); >>> >>> + /* for core.commentChar */ >>> + git_config(git_default_config, NULL); >>> + > > I can sort-of see why the original (logically) reads the > configuration files twice by making two separate calls to > git_config(), but I do not think we should add a third round like > this patch does. Shouldn't git-trailer-default-config have a > fallthru call to git-default-config instead? Thanks, I was going to say the same thing. Also, would it be possible to add a test? ```