git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: David Barr <david.barr@cordelta.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	David Barr <david.barr@cordelta.com>
Subject: [PATCH] fast-import: Allow filemodify to set the root
Date: Thu,  7 Oct 2010 21:55:06 +1100	[thread overview]
Message-ID: <1286448906-1424-1-git-send-email-david.barr@cordelta.com> (raw)

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.

Commit-message-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Barr <david.barr@cordelta.com>
---
 fast-import.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/fast-import.c b/fast-import.c
index 2317b0f..8f68a89 100644
--- 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)
-- 
1.7.3

             reply	other threads:[~2010-10-07 10:56 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-07 10:55 David Barr [this message]
2010-10-07 13:58 ` [PATCH] fast-import: Allow filemodify to set the root Sverre Rabbelier
2010-10-07 20:28   ` Jonathan Nieder
2010-10-07 20:35     ` Sverre Rabbelier
2010-10-07 23:45       ` David Barr
2010-10-07 23:46         ` David Barr
2010-10-07 23:55           ` Sverre Rabbelier
2010-10-08  6:50     ` Johannes Sixt
2010-10-08  7:05       ` Jonathan Nieder
2010-10-08  7:23         ` Johannes Sixt
2010-10-08  8:00           ` Jonathan Nieder
2010-10-08  8:15 ` Ramkumar Ramachandra
2010-10-08  8:33   ` Gabriel Filion
2010-10-08  8:58     ` David Michael Barr
2010-10-08 16:34       ` Sverre Rabbelier
2010-10-08 17:09         ` Jonathan Nieder
2010-10-09 22:11           ` David Michael Barr
2010-10-09 22:12             ` Sverre Rabbelier
2010-10-10  3:30               ` David Barr
2010-10-11  6:34                 ` Jonathan Nieder
2010-10-18  1:00                   ` [PATCH 0/2] " Jonathan Nieder
2010-10-18  1:03                     ` [PATCH 1/2] fast-import: filemodify after M 040000 <tree> "" crashes Jonathan Nieder
2010-10-18  1:13                       ` Sverre Rabbelier
2010-10-18  1:44                         ` Jonathan Nieder
2010-10-20 20:25                       ` [PATCH] fast-import: do not clear notes in do_change_note_fanout() Jonathan Nieder
2010-10-18  1:08                     ` [PATCH 2/2] fast-import: tighten M 040000 syntax Jonathan Nieder
2011-01-16  2:22                 ` [PATCH] Documentation/fast-import: put explanation of M 040000 <dataref> "" in context Jonathan Nieder
2011-01-18 15:04                   ` Junio C Hamano
2011-01-18 21:16                     ` Jonathan Nieder
2011-01-18 21:43                       ` Junio C Hamano
2011-01-18 22:02                         ` 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

  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=1286448906-1424-1-git-send-email-david.barr@cordelta.com \
    --to=david.barr@cordelta.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=srabbelier@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).