# [PATCH, resend] git-commit: colored status when color.ui is set 4 messages from 2009-01-08 to 2009-01-09. Participants: Markus Heidelberg, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/17055 ## Markus Heidelberg, 2009-01-08 18:53 Subject: [PATCH, resend] git-commit: colored status when color.ui is set Message-ID: <200901081953.01418.markus.heidelberg@web.de> URL: https://gitlist.dev/e/200901081953.01418.markus.heidelberg%40web.de ``` When using "git commit" and there was nothing to commit (the editor wasn't launched), the status output wasn't colored, even though color.ui was set. Only when setting color.status it worked. Signed-off-by: Markus Heidelberg --- builtin-commit.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/builtin-commit.c b/builtin-commit.c index e88b78f..2d90f74 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -945,6 +945,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) git_config(git_commit_config, NULL); + if (wt_status_use_color == -1) + wt_status_use_color = git_use_color_default; + argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix); index_file = prepare_index(argc, argv, prefix); -- 1.6.1.35.g0c23 ``` ## Junio C Hamano, 2009-01-09 09:00 Subject: Re: [PATCH, resend] git-commit: colored status when color.ui is set Message-ID: <7viqoo26rq.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7viqoo26rq.fsf%40gitster.siamese.dyndns.org In-Reply-To: <200901081953.01418.markus.heidelberg@web.de> ``` Markus Heidelberg writes: > When using "git commit" and there was nothing to commit (the editor > wasn't launched), the status output wasn't colored, even though color.ui > was set. Only when setting color.status it worked. > > Signed-off-by: Markus Heidelberg > --- > builtin-commit.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/builtin-commit.c b/builtin-commit.c > index e88b78f..2d90f74 100644 > --- a/builtin-commit.c > +++ b/builtin-commit.c > @@ -945,6 +945,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) > > git_config(git_commit_config, NULL); > > + if (wt_status_use_color == -1) > + wt_status_use_color = git_use_color_default; > + > argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix); > > index_file = prepare_index(argc, argv, prefix); My first reaction was: When the editor does get launched, what would the new code do with your patch? Would we see bunch of escape codes in the editor now? But we do disable color explicitly when we generate contents to feed the editor in that case since bc5d248 (builtin-commit: do not color status output shown in the message template, 2007-11-18), so that fear is unfounded. Thanks for a reminder, will queue. ``` ## Johannes Schindelin, 2009-01-09 10:56 Subject: Re: [PATCH, resend] git-commit: colored status when color.ui is set Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0901091155210.30769%40pacific.mpi-cbg.de In-Reply-To: <7viqoo26rq.fsf@gitster.siamese.dyndns.org> ``` Hi, On Fri, 9 Jan 2009, Junio C Hamano wrote: > Markus Heidelberg writes: > > > When using "git commit" and there was nothing to commit (the editor > > wasn't launched), the status output wasn't colored, even though color.ui > > was set. Only when setting color.status it worked. > > > > Signed-off-by: Markus Heidelberg > > --- > > builtin-commit.c | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > > > > diff --git a/builtin-commit.c b/builtin-commit.c > > index e88b78f..2d90f74 100644 > > --- a/builtin-commit.c > > +++ b/builtin-commit.c > > @@ -945,6 +945,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) > > > > git_config(git_commit_config, NULL); > > > > + if (wt_status_use_color == -1) > > + wt_status_use_color = git_use_color_default; > > + > > argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix); > > > > index_file = prepare_index(argc, argv, prefix); > > My first reaction was: > > When the editor does get launched, what would the new code do with > your patch? Would we see bunch of escape codes in the editor now? > > But we do disable color explicitly when we generate contents to feed the > editor in that case since bc5d248 (builtin-commit: do not color status > output shown in the message template, 2007-11-18), so that fear is > unfounded. I had the same reaction, so I would like to see this reasoning in the commit message. Ciao, Dscho ``` ## Markus Heidelberg, 2009-01-09 16:24 Subject: Re: [PATCH, resend] git-commit: colored status when color.ui is set Message-ID: <200901091724.59983.markus.heidelberg@web.de> URL: https://gitlist.dev/e/200901091724.59983.markus.heidelberg%40web.de In-Reply-To: ``` Johannes Schindelin, 09.01.2009: > Hi, > > On Fri, 9 Jan 2009, Junio C Hamano wrote: > > > Markus Heidelberg writes: > > > When using "git commit" and there was nothing to commit (the editor > > > wasn't launched), the status output wasn't colored, even though color.ui > > > was set. Only when setting color.status it worked. > > > > My first reaction was: > > > > When the editor does get launched, what would the new code do with > > your patch? Would we see bunch of escape codes in the editor now? Of course I tested this case :) > > But we do disable color explicitly when we generate contents to feed the > > editor in that case since bc5d248 (builtin-commit: do not color status > > output shown in the message template, 2007-11-18), so that fear is > > unfounded. > > I had the same reaction, so I would like to see this reasoning in the > commit message. wt_status_use_color could have already been set during git_config() without this patch, just not with color.ui, but color.status, so this is not really a new case. But I can understand the reaction and don't have ocjections against this explanation in the commit message. Markus ```