* [PATCH] fmt-merge-msg: detached HEAD
@ 2007-01-25 15:36 Santi Béjar
2007-01-26 0:16 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Santi Béjar @ 2007-01-25 15:36 UTC (permalink / raw)
To: Git Mailing List
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);
--
1.5.0.rc2.g2fa185-dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] fmt-merge-msg: detached HEAD
2007-01-25 15:36 [PATCH] fmt-merge-msg: detached HEAD Santi Béjar
@ 2007-01-26 0:16 ` Junio C Hamano
2007-01-26 9:45 ` Santi Béjar
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2007-01-26 0:16 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
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?
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fmt-merge-msg: detached HEAD
2007-01-26 0:16 ` Junio C Hamano
@ 2007-01-26 9:45 ` Santi Béjar
2007-01-26 9:59 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Santi Béjar @ 2007-01-26 9:45 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fmt-merge-msg: detached HEAD
2007-01-26 9:45 ` Santi Béjar
@ 2007-01-26 9:59 ` Junio C Hamano
2007-01-26 10:15 ` Santi Béjar
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2007-01-26 9:59 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
"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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fmt-merge-msg: detached HEAD
2007-01-26 9:59 ` Junio C Hamano
@ 2007-01-26 10:15 ` Santi Béjar
2007-01-26 23:45 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Santi Béjar @ 2007-01-26 10:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fmt-merge-msg: detached HEAD
2007-01-26 10:15 ` Santi Béjar
@ 2007-01-26 23:45 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2007-01-26 23:45 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
"Santi Béjar" <sbejar@gmail.com> writes:
>> > 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?"
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-01-26 23:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-25 15:36 [PATCH] fmt-merge-msg: detached HEAD Santi Béjar
2007-01-26 0:16 ` Junio C Hamano
2007-01-26 9:45 ` Santi Béjar
2007-01-26 9:59 ` Junio C Hamano
2007-01-26 10:15 ` Santi Béjar
2007-01-26 23:45 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).