{"thread":{"id":"52255","subject":"Merge commit says refs/heads/ instead of ","startedAt":"2019-11-12T23:49:24Z","lastAt":"2019-11-29T08:05:36Z","messageCount":5,"participants":["Mateusz Loskot","Jeff King","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"386066","messageId":"CABUeae82_qQrR5s_QYsDzkVX6CeVM-B7pT5DZt_BjpL=KJdtBg@mail.gmail.com","threadId":"52255","inReplyTo":null,"subject":"Merge commit says refs/heads/ instead of ","fromName":"Mateusz Loskot","fromEmail":"mateusz@loskot.net","sentAt":"2019-11-12T23:48:53Z","receivedAt":"2019-11-12T23:49:24Z","isPatch":false,"sender":{"key":"mateusz@loskot.net","avatar":"https://gravatar.com/avatar/fe5a0ce8995d4986f5c46aad6353e21717808da58e4bc710da1a100e247be239?d=mp&s=160"},"body":"Hi,\n\nAfter setting up a new machine with latest Git and\nI noticed commit messages for true merge changed from\n\n Merge branch ''\nto\n Merge branch 'refs/heads/'\n\nNothing changed in the merge workflow or git configuration\n\nI'm failing to find in the docs what drives that change, what\nconfiguration option controls such (default?) message.\n\nWhat may be the reason of that change?\n\nBest regards\n-- \nMateusz Loskot, http://mateusz.loskot.net\n"},{"id":"386093","messageId":"20191113051530.GA3547@sigill.intra.peff.net","threadId":"52255","inReplyTo":"CABUeae82_qQrR5s_QYsDzkVX6CeVM-B7pT5DZt_BjpL=KJdtBg@mail.gmail.com","subject":"Re: Merge commit says refs/heads/ instead of ","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-11-13T05:15:30Z","receivedAt":"2019-11-13T05:15:32Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 13, 2019 at 12:48:53AM +0100, Mateusz Loskot wrote:\n\n> After setting up a new machine with latest Git and\n> I noticed commit messages for true merge changed from\n> \n> Merge branch ''\n> to\n> Merge branch 'refs/heads/'\n> \n> Nothing changed in the merge workflow or git configuration\n\nI can't reproduce the problem here. If I set up a repository like this:\n\n git init repo && cd repo\n >base && git add base && git commit -m base\n >master && git add master && git commit -m master\n git checkout -b side HEAD^\n >side && git add side && git commit -m side\n git checkout master\n git tag tip\n\nand then run:\n\n git reset --hard tip && git merge --no-edit side\n git log -1 --oneline\n\nI get:\n\n Merge branch 'side'\n\nIf I do:\n\n git reset --hard tip && git merge --no-edit refs/heads/side\n git log -1 --oneline\n\nthen I get:\n\n Merge branch 'refs/heads/side'\n\nAnd the behavior seems the same going back to older versions of Git. Are\nyou sure your workflow hasn't changed somehow?\n\nCan you show an example that triggers the behavior for you?\n\n> I'm failing to find in the docs what drives that change, what\n> configuration option controls such (default?) message.\n> \n> What may be the reason of that change?\n\nI think any change there would probably be unintentional (but it's hard\nto say for sure without tracking it down).\n\n-Peff\n"},{"id":"386098","messageId":"xmqq8sokb673.fsf@gitster-ct.c.googlers.com","threadId":"52255","inReplyTo":"20191113051530.GA3547@sigill.intra.peff.net","subject":"Re: Merge commit says refs/heads/ instead of ","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-13T07:12:32Z","receivedAt":"2019-11-13T07:12:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> If I do:\n>\n> git reset --hard tip && git merge --no-edit refs/heads/side\n> git log -1 --oneline\n>\n> then I get:\n>\n> Merge branch 'refs/heads/side'\n>\n> And the behavior seems the same going back to older versions of Git. Are\n> you sure your workflow hasn't changed somehow?\n>\n> Can you show an example that triggers the behavior for you?\n\nYes, I am curious, too.\n\n>> I'm failing to find in the docs what drives that change, what\n>> configuration option controls such (default?) message.\n>> \n>> What may be the reason of that change?\n>\n> I think any change there would probably be unintentional (but it's hard\n> to say for sure without tracking it down).\n\nIf older versions of git produced \"Merge branch 'side'\" when told to\nmerge 'refs/heads/side', I could sort-of believe it. And if we no\nlonger do so and instead record \"Merge branch 'refs/heads/side'\",\nthen I actually think that is a desirable change.\n\nBy the way, pulling from self follows slightly different rule, i.e.\n\n\t$ git pull . refs/heads/side\n\nwould likely give you \"Merge branch 'side'\".\n\n\n\n"},{"id":"386343","messageId":"CABUeae9m+r-p-aaix_NFTFB1cAomFHgC8mckRHPiiRt1qRwv_w@mail.gmail.com","threadId":"52255","inReplyTo":"xmqq8sokb673.fsf@gitster-ct.c.googlers.com","subject":"Re: Merge commit says refs/heads/ instead of ","fromName":"Mateusz Loskot","fromEmail":"mateusz@loskot.net","sentAt":"2019-11-15T21:54:37Z","receivedAt":"2019-11-15T21:55:07Z","isPatch":false,"sender":{"key":"mateusz@loskot.net","avatar":"https://gravatar.com/avatar/fe5a0ce8995d4986f5c46aad6353e21717808da58e4bc710da1a100e247be239?d=mp&s=160"},"body":"On Wed, 13 Nov 2019 at 08:12, Junio C Hamano wrote:\n> Jeff King writes:\n>\n> > If I do:\n> >\n> > git reset --hard tip && git merge --no-edit refs/heads/side\n> > git log -1 --oneline\n> >\n> > then I get:\n> >\n> > Merge branch 'refs/heads/side'\n> >\n> > And the behavior seems the same going back to older versions of Git. Are\n> > you sure your workflow hasn't changed somehow?\n> >\n> > Can you show an example that triggers the behavior for you?\n>\n> Yes, I am curious, too.\n\nJeff, Junio,\n\nThank you very much for your responses and confirmations\nof expected behaviours.\n\nI will try to confirm with my colleagues what's changed,\nwhat are actual commands and Git versions in use.\nI'll be back here if I discover anything suspicious.\n\nBest regards,\n-- \nMateusz Loskot, http://mateusz.loskot.net\n"},{"id":"387297","messageId":"CABUeae9jBpvkxPGZPC=vFsuxB2r63W457LqWvXynF4Jnbm4HXg@mail.gmail.com","threadId":"52255","inReplyTo":"CABUeae9m+r-p-aaix_NFTFB1cAomFHgC8mckRHPiiRt1qRwv_w@mail.gmail.com","subject":"Re: Merge commit says refs/heads/ instead of ","fromName":"Mateusz Loskot","fromEmail":"mateusz@loskot.net","sentAt":"2019-11-29T08:06:13Z","receivedAt":"2019-11-29T08:05:36Z","isPatch":false,"sender":{"key":"mateusz@loskot.net","avatar":"https://gravatar.com/avatar/fe5a0ce8995d4986f5c46aad6353e21717808da58e4bc710da1a100e247be239?d=mp&s=160"},"body":"On Fri, 15 Nov 2019 at 22:54, Mateusz Loskot wrote:\n> On Wed, 13 Nov 2019 at 08:12, Junio C Hamano wrote:\n> > Jeff King writes:\n> >\n> > > If I do:\n> > >\n> > > git reset --hard tip && git merge --no-edit refs/heads/side\n> > > git log -1 --oneline\n> > >\n> > > then I get:\n> > >\n> > > Merge branch 'refs/heads/side'\n> > >\n> > > And the behavior seems the same going back to older versions of Git. Are\n> > > you sure your workflow hasn't changed somehow?\n> > >\n> > > Can you show an example that triggers the behavior for you?\n> >\n> > Yes, I am curious, too.\n>\n> Jeff, Junio,\n>\n> Thank you very much for your responses and confirmations\n> of expected behaviours.\n>\n> I will try to confirm with my colleagues what's changed,\n> what are actual commands and Git versions in use.\n> I'll be back here if I discover anything suspicious.\n\nApparently, the workflow involved Git client Fork and one of recent\nupdates of the client introduced the change in the behaviour:\n\nI reported the issue\nhttps://github.com/ForkIssues/TrackerWin/issues/570\nand the bug has been confirmed\n\"we replaced git merge branch with git merge /refs/heads/branch\"\n\nJeff, Junio, thanks for help.\n\nBest regards,\n-- \nMateusz Loskot, http://mateusz.loskot.net\n"}]}