# [PATCH] fmt-merge-msg: detached HEAD 6 messages from 2007-01-25 to 2007-01-26. Participants: Santi Béjar, Junio C Hamano. Thread: https://gitlist.dev/t/6523 ## Santi Béjar, 2007-01-25 15:36 Subject: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <87zm875d9u.fsf@gmail.com> URL: https://gitlist.dev/e/87zm875d9u.fsf%40gmail.com ``` Do not say 'Merge ... into HEAD' when detached. Signed-off-by: Santi Béjar --- 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 ``` ## Junio C Hamano, 2007-01-26 00:16 Subject: Re: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <7vireu63rg.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vireu63rg.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <87zm875d9u.fsf@gmail.com> ``` Santi Béjar writes: > Do not say 'Merge ... into HEAD' when detached. > > Signed-off-by: Santi Béjar > --- > 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, 2007-01-26 09:45 Subject: Re: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com> URL: https://gitlist.dev/e/8aa486160701260145i4c50d564n90967a07f7ee62a9%40mail.gmail.com In-Reply-To: <7vireu63rg.fsf@assigned-by-dhcp.cox.net> ``` On 1/26/07, Junio C Hamano wrote: > Santi Béjar writes: > > > Do not say 'Merge ... into HEAD' when detached. > > > > Signed-off-by: Santi Béjar > > --- > > 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, 2007-01-26 09:59 Subject: Re: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <7vveiuyup7.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vveiuyup7.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com> ``` "Santi Béjar" 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". ``` ## Santi Béjar, 2007-01-26 10:15 Subject: Re: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com> URL: https://gitlist.dev/e/8aa486160701260215p6a0af653qf110aa2679452c6%40mail.gmail.com In-Reply-To: <7vveiuyup7.fsf@assigned-by-dhcp.cox.net> ``` On 1/26/07, Junio C Hamano wrote: > "Santi Béjar" 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, 2007-01-26 23:45 Subject: Re: [PATCH] fmt-merge-msg: detached HEAD Message-ID: <7v64atuzbc.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v64atuzbc.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com> ``` "Santi Béjar" 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?" ```