[PATCH, resend] git-commit: colored status when color.ui is set

[PATCH, resend] git-commit: colored status when color.ui is set

[Markus Heidelberg]

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 <markus.heidelberg@web.de>
---
 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

Re: [PATCH, resend] git-commit: colored status when color.ui is set

[Junio C Hamano]

Markus Heidelberg <markus.heidelberg@web.de> 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 <markus.heidelberg@web.de>
> ---
>  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.

Re: [PATCH, resend] git-commit: colored status when color.ui is set

[Johannes Schindelin]

Hi,

On Fri, 9 Jan 2009, Junio C Hamano wrote:

> Markus Heidelberg <markus.heidelberg@web.de> 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 <markus.heidelberg@web.de>
> > ---
> >  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

Re: [PATCH, resend] git-commit: colored status when color.ui is set

[Markus Heidelberg]

Johannes Schindelin, 09.01.2009:
> Hi,
> 
> On Fri, 9 Jan 2009, Junio C Hamano wrote:
> 
> > Markus Heidelberg <markus.heidelberg@web.de> 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