Re: [patch] color of branches in git status -sb

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 17, 2011, 01:13 UTC
Message-ID: <7v4ny3pn4v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CA+TMmKns-9jiedxY4FiJoBg8akkxwkPBib11EmvCD3r7mRA6vQ@mail.gmail.com>

Nicolas Dudebout <nicolas.dudebout@gmail.com> writes:

Show 13 quoted lines

> The following patch fixes the fact that two colors of the status
> output could not be configured in .git/config.
>
> The color of the current branch could not be modified because of the
> name WT_STATUS_ONBRANCH having been changed to WT_STATUS_LOCAL_BRANCH.
>
> The color of the remote branch was not defined at all.
>
> By the way, when I do 'git status' instead of git 'status -sb' the
> local and remote branch do not get colored. Is this a desired
> behavior?
>
> Nicolas

Please follow Documentation/SubmittingPatches.

Also expect that patches to add new feature this deep in the pre-release feature freeze period is not likely to get reviewed by regular list members.

>
> 	Modified   Documentation/config.txt

Don't do this. We can tell what is modified from "diff --git" lines.

Show 8 quoted lines

> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 5a841da..7a0ddd6 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -809 +809,2 @@ color.status.<slot>::
> -	`branch` (the current branch), or
> +	`branch` (the current branch),
> +        `remote` (the remote branch) or

Don't do this. Proper patches have context lines for good reasons.

Show 10 quoted lines

> 	Modified   builtin/commit.c
> diff --git a/builtin/commit.c b/builtin/commit.c
> index c46f2d1..4674600 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1118 +1118,3 @@ static int parse_status_slot(const char *var, int offset)
> -		return WT_STATUS_ONBRANCH;
> +		return WT_STATUS_LOCAL_BRANCH;
> +	if (!strcasecmp(var+offset, "remote"))
> +		return WT_STATUS_REMOTE_BRANCH;