Re: [PATCH] Updated status to show 'Not currently on any branch' in red

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, May 15, 2008 at 08:37:52PM +0100, Chris Parsons wrote:

> Hi all, first post and patch, please be gentle :)

Hi, and welcome.

But as Miklos pointed out, please separate "cover letter" material from
the commit message by putting it under the "---" cut.

> I'm a fairly new user to git and have more than once been burnt by  
> checking out an arbitrary commit and then checking in code on top of that 
> commit. If you realise your mistake quickly, you can reset and reapply the 
> commit to a branch, but if you checkout another branch your commit can 
> disappear and become hard to find.
>
> Therefore as a help to new users I've turned the 'Not currently on any  
> branch' red on 'git status' so that it's harder to miss the fact.

I think this is definitely a good change overall, but I have some
specific comments on the implementation below.

> Perhaps git should not allow commits in this case? I'm too much of a  
> novice to know whether that's ever needed, but perhaps someone has a good 
> reason for allowing it.

There was much discussion of this when the detached HEAD feature was
introduced, but it was decided that allowing commits was useful. I think
putting the text in red is a nice way to highlight a potential mistake,
though.

>  static const char use_add_msg[] =
> @@ -315,7 +316,8 @@ void wt_status_print(struct wt_status *s)
>  {
>  	unsigned char sha1[20];
>  	s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
> -
> +  const char* branch_color = color(WT_STATUS_HEADER);
> +

Indentation?

> -		color_fprintf_ln(s->fp, color(WT_STATUS_HEADER),
> +		color_fprintf_ln(s->fp, branch_color,
>  			"# %s%s", on_what, branch_name);

This makes the whole line red; I think it would look nicer matching the
red / green files last on in the file list by coloring just the message
part. IOW,

  color_fprintf(s->fp, color(WT_STATUS_HEADER), "# ");
  color_fprintf_ln(s->fp, branch_color, %s%s", on_what, branch_name);


And two final points on missing items:

  1. This should probably be configurable. You'd need to update
     parse_status_slot, as well as the documentation in config.txt.

  2. Note that this just covers the colorization of status sent to the
     terminal or pager. What is seen in the editor while writing the
     commit message (which is a likely place to want to warn the user)
     is colorized by the editor itself. In that case, you might want to
     either make a patch or a suggestion to the author of your favorite
     editor's colorization package.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux