{"thread":{"id":"52108","subject":"[BUG] \"git rebase -r\" lacks sanitation on merges with arbitrary reference syntax","startedAt":"2019-10-24T10:42:34Z","lastAt":"2019-10-25T13:10:12Z","messageCount":2,"participants":["ydirson@free.fr","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"384758","messageId":"479118979.-772834452.1571913751603.JavaMail.root@zimbra39-e7","threadId":"52108","inReplyTo":"717060483.-772858077.1571913448492.JavaMail.root@zimbra39-e7","subject":"[BUG] \"git rebase -r\" lacks sanitation on merges with arbitrary reference syntax","fromName":"","fromEmail":"ydirson@free.fr","sentAt":"2019-10-24T10:42:31Z","receivedAt":"2019-10-24T10:42:34Z","isPatch":false,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"Hello,\n\nI have a branch which does successive merges from a vendor branch, like:\n\n git merge vendor/poky-intercepts^{/warrior}'\n git merge vendor/poky-intercepts^{/zeus}'\n\nNow if I try to use \"rebase -r\" across such a merge, the result is:\n\n error: refusing to update ref with bad name 'refs/rewritten/vendor/poky-intercepts^{/warrior}'\n hint: Could not execute the todo command\n hint: \n hint:     label vendor/poky-intercepts^{/warrior}\n hint: \n hint: It has been rescheduled; To edit the command before continuing, please\n hint: edit the todo list first:\n hint: \n hint:     git rebase --edit-todo\n hint:     git rebase --continue\n\nIf I manually sanitize the label name, everything's fine.\n"},{"id":"384859","messageId":"nycvar.QRO.7.76.6.1910251508100.46@tvgsbejvaqbjf.bet","threadId":"52108","inReplyTo":"479118979.-772834452.1571913751603.JavaMail.root@zimbra39-e7","subject":"Re: [BUG] \"git rebase -r\" lacks sanitation on merges with arbitrary reference syntax","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-10-25T13:09:53Z","receivedAt":"2019-10-25T13:10:12Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Yann,\n\nOn Thu, 24 Oct 2019, ydirson@free.fr wrote:\n\n> I have a branch which does successive merges from a vendor branch, like:\n>\n>  git merge vendor/poky-intercepts^{/warrior}'\n>  git merge vendor/poky-intercepts^{/zeus}'\n>\n> Now if I try to use \"rebase -r\" across such a merge, the result is:\n>\n>  error: refusing to update ref with bad name 'refs/rewritten/vendor/poky-intercepts^{/warrior}'\n>  hint: Could not execute the todo command\n>  hint:\n>  hint:     label vendor/poky-intercepts^{/warrior}\n>  hint:\n>  hint: It has been rescheduled; To edit the command before continuing, please\n>  hint: edit the todo list first:\n>  hint:\n>  hint:     git rebase --edit-todo\n>  hint:     git rebase --continue\n>\n> If I manually sanitize the label name, everything's fine.\n\nThe patch series is stalled a little:\nhttps://github.com/gitgitgadget/git/pull/327\n\nUnfortunately, we are deep in -rc mode for the upcoming v2.24.0, so I\ndon't think that this bug fix will make it into that release, there are\nmore pressing bugs.\n\nBut it is still on my radar!\n\nCiao,\nJohannes\n"}]}