git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: ydirson@free.fr
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax
Date: Fri, 25 Oct 2019 15:09:53 +0200 (CEST)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.1910251508100.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <479118979.-772834452.1571913751603.JavaMail.root@zimbra39-e7>

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

      reply	other threads:[~2019-10-25 13:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [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 [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=nycvar.QRO.7.76.6.1910251508100.46@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=ydirson@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).