Re: [PATCH] fmt-merge-msg: detached HEAD

From: Santi Béjar <sbejar@gmail.com>
Date: Jan 26, 2007, 09:45 UTC
Message-ID: <8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com>
In-Reply-To: <7vireu63rg.fsf@assigned-by-dhcp.cox.net>

On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:

Show 27 quoted lines

> Santi Béjar <sbejar@gmail.com> writes:
>
> > Do not say 'Merge ... into HEAD' when detached.
> >
> > Signed-off-by: Santi Béjar <sbejar@gmail.com>
> > ---
> >  builtin-fmt-merge-msg.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > 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.

Santi