From: Jeff King <peff@peff.net>
To: Seaders Oloinsigh <seaders69@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git filter-branch --subdirectory-filter not working as expected, history of other folders is preserved
Date: Mon, 10 Oct 2016 11:30:32 -0400 [thread overview]
Message-ID: <20161010153032.v2x773cbs4ifvzec@sigill.intra.peff.net> (raw)
In-Reply-To: <CAN40BKqPdPP2+K4FBzgDDfYiGkzk1gYcOeP==_t+pr5w0rj0EQ@mail.gmail.com>
On Mon, Oct 10, 2016 at 02:42:36PM +0100, Seaders Oloinsigh wrote:
> We have a git repository that looks like
>
> sdk/
> android/
> ios/
> unity/
> windows/
>
> Which we'd like to split into 4 repositories, 1 for each platform. To
> start this process (for splitting android out), I ran,
>
> git filter-branch -f --prune-empty --subdirectory-filter android -- --all
OK, so that should rewrite each ref to have only the contents of the
"android" directory at the top-level.
Note that filter-branch saves a copy of the old refs in refs/original.
> Which rewrote a ton of history and commits, and looked like it worked, but
> on closer inspection had left a ton of history behind.
>
> If I run
>
> git log --all -- unity/
>
> It returns a list of commits that happened in the unity/ subfolder of the
> original root.
Here you asked for "--all", which includes refs/original. So you are
seeing the original, unwritten commits (and none of your new ones, of
course, because they do not have a unity/ directory!).
Try:
git log --all --source -- unity
to see which ref each commit is coming from.
Or try:
git log --branches --tags -- unity
to confirm that your branches and tags do not include that path.
Or just:
git for-each-ref --format='delete %(refname)' refs/original |
git update-ref --stdin
to get rid of the backup refs entirely.
-Peff
next prev parent reply other threads:[~2016-10-10 15:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-10 13:42 git filter-branch --subdirectory-filter not working as expected, history of other folders is preserved Seaders Oloinsigh
2016-10-10 15:30 ` Jeff King [this message]
2016-10-10 16:12 ` Seaders Oloinsigh
2016-10-10 18:19 ` Jeff King
2016-10-11 13:56 ` Seaders Oloinsigh
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=20161010153032.v2x773cbs4ifvzec@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=seaders69@gmail.com \
/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).