From: "David Neu" <david@davidneu.com>
To: "Michael J Gruber" <michaeljgruber+gmane@fastmail.fm>
Cc: git@vger.kernel.org
Subject: Re: Converting from svn to git
Date: Mon, 11 Aug 2008 13:46:43 -0400 [thread overview]
Message-ID: <e0b44a890808111046q2626defdnab31b0d7b1c4578@mail.gmail.com> (raw)
In-Reply-To: <e0b44a890808100848p367f5c66qfa21cba1b3ba12a0@mail.gmail.com>
OK, I did
$ git-filter-branch --tree-filter 'rm -rf subdir1/ subdir2/ subdir3/' -- --all
which looks good, except when I open gitk, I still see "empty" commits
that correspond to subdir1/, subdir2/ and subdir3/.
Is there anyway to remove those?
Many thanks!
Cheers,
David
On Sun, Aug 10, 2008 at 11:48 AM, David Neu <david@davidneu.com> wrote:
> That's great - thanks to everyone!
>
> On Sun, Aug 10, 2008 at 11:32 AM, Michael J Gruber
> <michaeljgruber+gmane@fastmail.fm> wrote:
>> David Neu venit, vidit, dixit 10.08.2008 16:54:
>>>
>>> Thanks for the reply - this looks like what I'd need, but
>>> I can't see how to keep the contents of the base dir and
>>> lose the subdirs, e.g.
>>>
>>> $ git-filter-branch --subdirectory-filter . HEAD
>>>
>>> removes all subdirs and the contents of the base dir.
>>>
>>> So, I figure I'd remove each subdir, using
>>>
>>> $ git-filter-branch --tree-filter 'rm -rf subdir1/' HEAD
>>>
>>> but this complains if subdir1 contains subdirectories, it
>>> says: Namespace refs/original/ not empty
>>
>> It complains because filter-branch stores the original refs in that
>> namespace, and on the second filter-branch run it wants to do this again.
>> You can avoid this by using the "-f" option to filter-branch, or by removing
>> all subsirs in one go ("rm -rf subdir1 subdir2..."). Also, you might want to
>> rewrite all refs ("--all"), not just HEAD.
>>
>> Michael
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe git" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
next prev parent reply other threads:[~2008-08-11 17:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-10 13:11 Converting from svn to git David Neu
2008-08-10 13:24 ` Miklos Vajna
2008-08-10 14:54 ` David Neu
2008-08-10 15:32 ` Michael J Gruber
2008-08-10 15:48 ` David Neu
2008-08-11 17:46 ` David Neu [this message]
2008-08-15 13:58 ` Michael J Gruber
2008-08-17 9:11 ` Sam Vilain
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=e0b44a890808111046q2626defdnab31b0d7b1c4578@mail.gmail.com \
--to=david@davidneu.com \
--cc=git@vger.kernel.org \
--cc=michaeljgruber+gmane@fastmail.fm \
/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).