* [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax
[not found] <717060483.-772858077.1571913448492.JavaMail.root@zimbra39-e7>
@ 2019-10-24 10:42 ` ydirson
2019-10-25 13:09 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: ydirson @ 2019-10-24 10:42 UTC (permalink / raw)
To: git
Hello,
I have a branch which does successive merges from a vendor branch, like:
git merge vendor/poky-intercepts^{/warrior}'
git merge vendor/poky-intercepts^{/zeus}'
Now if I try to use "rebase -r" across such a merge, the result is:
error: refusing to update ref with bad name 'refs/rewritten/vendor/poky-intercepts^{/warrior}'
hint: Could not execute the todo command
hint:
hint: label vendor/poky-intercepts^{/warrior}
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint: git rebase --edit-todo
hint: git rebase --continue
If I manually sanitize the label name, everything's fine.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax
2019-10-24 10:42 ` [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax ydirson
@ 2019-10-25 13:09 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2019-10-25 13:09 UTC (permalink / raw)
To: ydirson; +Cc: git
Hi Yann,
On Thu, 24 Oct 2019, ydirson@free.fr wrote:
> I have a branch which does successive merges from a vendor branch, like:
>
> git merge vendor/poky-intercepts^{/warrior}'
> git merge vendor/poky-intercepts^{/zeus}'
>
> Now if I try to use "rebase -r" across such a merge, the result is:
>
> error: refusing to update ref with bad name 'refs/rewritten/vendor/poky-intercepts^{/warrior}'
> hint: Could not execute the todo command
> hint:
> hint: label vendor/poky-intercepts^{/warrior}
> hint:
> hint: It has been rescheduled; To edit the command before continuing, please
> hint: edit the todo list first:
> hint:
> hint: git rebase --edit-todo
> hint: git rebase --continue
>
> If I manually sanitize the label name, everything's fine.
The patch series is stalled a little:
https://github.com/gitgitgadget/git/pull/327
Unfortunately, we are deep in -rc mode for the upcoming v2.24.0, so I
don't think that this bug fix will make it into that release, there are
more pressing bugs.
But it is still on my radar!
Ciao,
Johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-25 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <717060483.-772858077.1571913448492.JavaMail.root@zimbra39-e7>
2019-10-24 10:42 ` [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax ydirson
2019-10-25 13:09 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).