From: Luciano Joublanc <email@example.com>
Subject: bug: report `rebase -i + subtree add --prefix = disaster`
Date: Fri, 13 Sep 2019 10:10:07 +0200 [thread overview]
Message-ID: <CAPYWsc08bROfbSHuiuFMrHK99NgqZ=euOkRh-KQHrEWC3w3NnQ@mail.gmail.com> (raw)
I would like to report what I suspect is a bug in `git rebase -i`.
The problem in question is that when a `rebase -i` is run on a repo
which has had a subtree added with `git subtree add --prefix=xxx`
previously; the later command will be executed without the `--prefix`
argument, resulting in the `subtree` command being replayed to the
_root_ of the repo.
To illustrate this example, this is what happened to me.
1. I ran `git subtree add --prefix=ui ../ui/ui.git master` on my repo
to merge a sub-project into the `ui` subdirectory.
2. Sometime later, I had to re-write history to remove a large binary.
I did this using
a) `git rebase -i` and
b) removing the file with `git rm bigfile.bin` and then `git commit --amend`.
c) completed the rebase with `git rebase --continue`.
3. The resulting repository had all the files of the subproject 'ui',
but in the root directory. e.g. previously I had folder `./ui/python`,
now I have `./python`.
Please let me know if I can produce any more information.
DAML Commando Team
c: +41 765 3223 82
Digital Asset (Switzerland) GmbH
8050 Zurich, Switzerland
This message, and any attachments, is for the intended recipient(s) only,
may contain information that is privileged, confidential and/or proprietary
and subject to important terms and conditions available at
<http://www.digitalasset.com/emaildisclaimer.html>. If you are not the
intended recipient, please delete this message.
reply other threads:[~2019-09-13 8:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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:
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 \
* 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
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).