From: ydirson@free.fr
To: git <git@vger.kernel.org>
Subject: [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax
Date: Thu, 24 Oct 2019 12:42:31 +0200 (CEST) [thread overview]
Message-ID: <479118979.-772834452.1571913751603.JavaMail.root@zimbra39-e7> (raw)
In-Reply-To: <717060483.-772858077.1571913448492.JavaMail.root@zimbra39-e7>
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.
next parent reply other threads:[~2019-10-24 10:42 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 ` ydirson [this message]
2019-10-25 13:09 ` [BUG] "git rebase -r" lacks sanitation on merges with arbitrary reference syntax Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=479118979.-772834452.1571913751603.JavaMail.root@zimbra39-e7 \
--to=ydirson@free.fr \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).