{"thread":{"id":"6523","subject":"[PATCH] fmt-merge-msg: detached HEAD","startedAt":"2007-01-25T15:36:45Z","lastAt":"2007-01-26T23:45:59Z","messageCount":6,"participants":["Santi Béjar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"32610","messageId":"87zm875d9u.fsf@gmail.com","threadId":"6523","inReplyTo":null,"subject":"[PATCH] fmt-merge-msg: detached HEAD","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-01-25T15:36:45Z","receivedAt":"2007-01-25T15:36:45Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"\nDo not say 'Merge ... into HEAD' when detached.\n\nSigned-off-by: Santi Béjar <sbejar@gmail.com>\n---\n builtin-fmt-merge-msg.c |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 87d3d63..8cef425 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \t\t\tprintf(\" of %s\", srcs.list[i]);\n \t}\n \n-\tif (!strcmp(\"master\", current_branch))\n+\tif (!strcmp(\"master\", current_branch) ||\n+\t    !strcmp(\"HEAD\", current_branch))\n \t\tputchar('\\n');\n \telse\n \t\tprintf(\" into %s\\n\", current_branch);\n-- \n1.5.0.rc2.g2fa185-dirty\n"},{"id":"32668","messageId":"7vireu63rg.fsf@assigned-by-dhcp.cox.net","threadId":"6523","inReplyTo":"87zm875d9u.fsf@gmail.com","subject":"Re: [PATCH] fmt-merge-msg: detached HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-26T00:16:51Z","receivedAt":"2007-01-26T00:16:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Santi Béjar <sbejar@gmail.com> writes:\n\n> Do not say 'Merge ... into HEAD' when detached.\n>\n> Signed-off-by: Santi Béjar <sbejar@gmail.com>\n> ---\n>  builtin-fmt-merge-msg.c |    3 ++-\n>  1 files changed, 2 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\n> index 87d3d63..8cef425 100644\n> --- a/builtin-fmt-merge-msg.c\n> +++ b/builtin-fmt-merge-msg.c\n> @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n>  \t\t\tprintf(\" of %s\", srcs.list[i]);\n>  \t}\n>  \n> -\tif (!strcmp(\"master\", current_branch))\n> +\tif (!strcmp(\"master\", current_branch) ||\n> +\t    !strcmp(\"HEAD\", current_branch))\n>  \t\tputchar('\\n');\n>  \telse\n>  \t\tprintf(\" into %s\\n\", current_branch);\n\nHmph.\n\nThe reason is?\n"},{"id":"32707","messageId":"8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com","threadId":"6523","inReplyTo":"7vireu63rg.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] fmt-merge-msg: detached HEAD","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-01-26T09:45:38Z","receivedAt":"2007-01-26T09:45:38Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:\n> Santi Béjar <sbejar@gmail.com> writes:\n>\n> > Do not say 'Merge ... into HEAD' when detached.\n> >\n> > Signed-off-by: Santi Béjar <sbejar@gmail.com>\n> > ---\n> >  builtin-fmt-merge-msg.c |    3 ++-\n> >  1 files changed, 2 insertions(+), 1 deletions(-)\n> >\n> > diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\n> > index 87d3d63..8cef425 100644\n> > --- a/builtin-fmt-merge-msg.c\n> > +++ b/builtin-fmt-merge-msg.c\n> > @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n> >                       printf(\" of %s\", srcs.list[i]);\n> >       }\n> >\n> > -     if (!strcmp(\"master\", current_branch))\n> > +     if (!strcmp(\"master\", current_branch) ||\n> > +         !strcmp(\"HEAD\", current_branch))\n> >               putchar('\\n');\n> >       else\n> >               printf(\" into %s\\n\", current_branch);\n>\n> Hmph.\n>\n> The reason is?\n\nFor me, 'Merge ... into master' and 'Merge ... into HEAD' are equally\nuseful, so do not show them by default. And git always merges into\nHEAD.\n\nSanti\n"},{"id":"32711","messageId":"7vveiuyup7.fsf@assigned-by-dhcp.cox.net","threadId":"6523","inReplyTo":"8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com","subject":"Re: [PATCH] fmt-merge-msg: detached HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-26T09:59:48Z","receivedAt":"2007-01-26T09:59:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Santi Béjar\" <sbejar@gmail.com> writes:\n\n>> > diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\n>> > index 87d3d63..8cef425 100644\n>> > --- a/builtin-fmt-merge-msg.c\n>> > +++ b/builtin-fmt-merge-msg.c\n>> > @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n>> >                       printf(\" of %s\", srcs.list[i]);\n>> >       }\n>> >\n>> > -     if (!strcmp(\"master\", current_branch))\n>> > +     if (!strcmp(\"master\", current_branch) ||\n>> > +         !strcmp(\"HEAD\", current_branch))\n>> >               putchar('\\n');\n>> >       else\n>> >               printf(\" into %s\\n\", current_branch);\n>>\n>> Hmph.\n>>\n>> The reason is?\n>\n> For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally\n> useful, so do not show them by default. And git always merges into\n> HEAD.\n\nI was wondering if people might prefer rewording it to \"into\ndetached HEAD\".\n"},{"id":"32713","messageId":"8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com","threadId":"6523","inReplyTo":"7vveiuyup7.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] fmt-merge-msg: detached HEAD","fromName":"Santi Béjar","fromEmail":"sbejar@gmail.com","sentAt":"2007-01-26T10:15:51Z","receivedAt":"2007-01-26T10:15:51Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:\n> \"Santi Béjar\" <sbejar@gmail.com> writes:\n>\n> >> > diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\n> >> > index 87d3d63..8cef425 100644\n> >> > --- a/builtin-fmt-merge-msg.c\n> >> > +++ b/builtin-fmt-merge-msg.c\n> >> > @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n> >> >                       printf(\" of %s\", srcs.list[i]);\n> >> >       }\n> >> >\n> >> > -     if (!strcmp(\"master\", current_branch))\n> >> > +     if (!strcmp(\"master\", current_branch) ||\n> >> > +         !strcmp(\"HEAD\", current_branch))\n> >> >               putchar('\\n');\n> >> >       else\n> >> >               printf(\" into %s\\n\", current_branch);\n> >>\n> >> Hmph.\n> >>\n> >> The reason is?\n> >\n> > For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally\n> > useful, so do not show them by default. And git always merges into\n> > HEAD.\n>\n> I was wondering if people might prefer rewording it to \"into\n> detached HEAD\".\n\nI prefer my patch, but your rewording is OK also.\n\nSanti\n"},{"id":"32781","messageId":"7v64atuzbc.fsf@assigned-by-dhcp.cox.net","threadId":"6523","inReplyTo":"8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com","subject":"Re: [PATCH] fmt-merge-msg: detached HEAD","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-26T23:45:59Z","receivedAt":"2007-01-26T23:45:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Santi Béjar\" <sbejar@gmail.com> writes:\n\n>> > For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally\n>> > useful, so do not show them by default. And git always merges into\n>> > HEAD.\n>>\n>> I was wondering if people might prefer rewording it to \"into\n>> detached HEAD\".\n>\n> I prefer my patch, but your rewording is OK also.\n\nI do not personally care either way -- the question is \"is\nmerging while your head is detached a major deal, or is it just\none of the random insignificant merges and it does not matter\nwhere it happened?\"\n"}]}