From: Jonathan Nieder <jrnieder@gmail•com>
To: Sverre Rabbelier <srabbelier@gmail•com>
Cc: David Barr <david.barr@cordelta•com>,
Git Mailing List <git@vger•kernel.org>,
Ramkumar Ramachandra <artagnon@gmail•com>
Subject: Re: [PATCH] contrib/svn-fe: Fast script to remap svn history
Date: Thu, 7 Oct 2010 03:28:08 -0500 [thread overview]
Message-ID: <20101007082808.GC10523@burratino> (raw)
In-Reply-To: <AANLkTim_3m=YmyVL7eEoWDGwDwmuDJsYkQMgx8ciVPH0@mail.gmail.com>
Sverre Rabbelier wrote:
> On Thu, Oct 7, 2010 at 08:06, David Barr <david.barr@cordelta•com> wrote:
>> --- a/fast-import.c
>> +++ b/fast-import.c
>> @@ -1454,6 +1454,15 @@ static int tree_content_set(
>> n = slash1 - p;
>> else
>> n = strlen(p);
>> + if (!slash1 && !n) {
>> + if (!S_ISDIR(mode))
>> + die("Root cannot be a non-directory");
>> + hashcpy(root->versions[1].sha1, sha1);
>> + if (root->tree)
>> + release_tree_content_recursive(root->tree);
>> + root->tree = subtree;
>> + return 1;
>> + }
>> if (!n)
>> die("Empty path component found in input");
>> if (!slash1 && !S_ISDIR(mode) && subtree)
>
> What is this hunk about?
Ooh, ack for this part (though I agree with you that it ought to be
explained in the log message).
Most git commands do their writing to the object db via the index and
loose objects. When you just have a pile of trees you want to convert
into commits, this is wasteful; for performance-critical operations
like filter-branch --subdirectory-filter, one might want a sort of
hash-object --batch-to-pack to write a pack directly.
Fortunately we have fast-import (which is one of the only git commands
that will write to a pack directly) but there is not an advertised way
to tell fast-import to use a given tree for its commits. So in
current git, one has the unpleasant choice of writing loose objects
without parsing the trees or writing straight to pack but having to
parse trees to do it.
This patch changes that, by allowing
M 040000 <tree id> ""
as a filemodify line in a commit to reset to a particular tree without
any need to unpack it. For example,
M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ""
is a synonym for the deleteall command.
next prev parent reply other threads:[~2010-10-07 8:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 6:06 [PATCH] contrib/svn-fe: Fast script to remap svn history David Barr
2010-10-07 6:29 ` Sverre Rabbelier
2010-10-07 7:17 ` David Michael Barr
2010-10-07 8:28 ` Jonathan Nieder [this message]
2010-11-21 5:17 ` Jonathan Nieder
2010-11-22 14:01 ` Stephen Bash
2010-11-22 17:42 ` Jonathan Nieder
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=20101007082808.GC10523@burratino \
--to=jrnieder@gmail$(echo .)com \
--cc=artagnon@gmail$(echo .)com \
--cc=david.barr@cordelta$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=srabbelier@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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