threads / patch / 6523

patchfmt-merge-msg: detached HEAD

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

## tl;dr

6 messages between Jan 25, 2007 and Jan 26, 2007. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Santi Béjar· Jan 25, 2007, 15:36 UTC · lore

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(-)

Show changes to builtin-fmt-merge-msg.c +2 −1

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);

-- 
1.5.0.rc2.g2fa185-dirty

Junio C Hamano· Jan 26, 2007, 00:16 UTC · re: Santi Béjar · lore

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

Santi Béjar <sbejar@gmail.com> writes:

Show 21 quoted lines

> 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?

Santi Béjar· Jan 26, 2007, 09:45 UTC · re: Junio C Hamano · lore

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

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

Junio C Hamano· Jan 26, 2007, 09:59 UTC · re: Santi Béjar · lore

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

"Santi Béjar" <sbejar@gmail.com> writes:

Show 22 quoted lines

>> > 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".

Santi Béjar· Jan 26, 2007, 10:15 UTC · re: Junio C Hamano · lore

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

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

Show 27 quoted lines

> "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

Junio C Hamano· Jan 26, 2007, 23:45 UTC · re: Santi Béjar · lore

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

"Santi Béjar" <sbejar@gmail.com> writes:

Show 8 quoted lines

>> > 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.

I do not personally care either way -- the question is "is merging while your head is detached a major deal, or is it just one of the random insignificant merges and it does not matter where it happened?"