From: Santi Béjar <sbejar@gmail.com>
Date: Fri, 26 Jan 2007 10:15:51 GMT
Subject: Re: [PATCH] fmt-merge-msg: detached HEAD
Message-ID: <8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com>
In-Reply-To: <7vveiuyup7.fsf@assigned-by-dhcp.cox.net>

On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:
> "Santi Béjar" <sbejar@gmail.com> writes:
>
> >> > diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
> >> > index 87d3d63..8cef425 100644
> >> > --- a/builtin-fmt-merge-msg.c
> >> > +++ b/builtin-fmt-merge-msg.c
> >> > @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
> >> >                       printf(" of %s", srcs.list[i]);
> >> >       }
> >> >
> >> > -     if (!strcmp("master", current_branch))
> >> > +     if (!strcmp("master", current_branch) ||
> >> > +         !strcmp("HEAD", current_branch))
> >> >               putchar('\n');
> >> >       else
> >> >               printf(" into %s\n", current_branch);
> >>
> >> Hmph.
> >>
> >> The reason is?
> >
> > For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally
> > useful, so do not show them by default. And git always merges into
> > HEAD.
>
> I was wondering if people might prefer rewording it to "into
> detached HEAD".

I prefer my patch, but your rewording is OK also.

Santi