Re: git and larger trees, not so fast?

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Linus Torvalds <torvalds@...>
Cc: Sean <seanlkml@...>, moe <moe-git@...>, <git@...>
Date: Thursday, August 9, 2007 - 7:38 pm

Junio C Hamano <gitster@pobox.com> writes:


While I do not think the previous one was hacky at all, this one
IS a hack, not meant for inclusion.  It makes the partial commit
codepath to use vanilla "git read-tree" without any single tree
merge semantics, and rewrite that codepath to use read_tree()
which was changed with my previous patch.



---

 builtin-read-tree.c |    5 ++++-
 git-commit.sh       |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index a3b17a3..61ea15c 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -258,7 +258,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 			opts.head_idx = 1;
 	}
 
-	unpack_trees(trees, &opts);
+	if (!opts.merge && !opts.prefix && trees && !trees->next)
+		read_tree((struct tree*) trees->item, 0, NULL);
+	else
+		unpack_trees(trees, &opts);
 
 	/*
 	 * When reading only one tree (either the most basic form,
diff --git a/git-commit.sh b/git-commit.sh
index d7e7028..b50468f 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -386,7 +386,7 @@ t,)
 		if test -z "$initial_commit"
 		then
 			GIT_INDEX_FILE="$THIS_INDEX" \
-			git read-tree --index-output="$TMP_INDEX" -i -m HEAD
+			git read-tree --index-output="$TMP_INDEX" HEAD
 		else
 			rm -f "$TMP_INDEX"
 		fi || exit

-
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git and larger trees, not so fast?, moe, (Thu Aug 9, 12:30 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Sat Aug 11, 2:47 pm)
Re: git and larger trees, not so fast?, moe, (Sat Aug 11, 4:06 pm)
Re: git and larger trees, not so fast?, moe, (Wed Aug 22, 8:30 pm)
Re: git and larger trees, not so fast?, Fernando J. Pereda, (Sat Aug 11, 3:02 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Sat Aug 11, 4:38 pm)
Re: git and larger trees, not so fast?, Fernando J. Pereda, (Sat Aug 11, 4:51 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Sat Aug 11, 6:27 pm)
Re: git and larger trees, not so fast?, David Kastrup, (Sat Aug 11, 7:26 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Fri Aug 10, 3:39 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 1:11 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 1:54 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 1:38 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 2:06 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 2:11 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 4:42 pm)
Re: git and larger trees, not so fast?, Sean, (Thu Aug 9, 4:52 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 5:41 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 5:46 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 6:02 pm)
Re: git and larger trees, not so fast?, Daniel Barkalow, (Thu Aug 9, 9:42 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 7:38 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 8:44 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 8:51 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Thu Aug 9, 8:57 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 11:48 pm)
Re: git and larger trees, not so fast?, Linus Torvalds, (Fri Aug 10, 12:07 pm)
Fix "git commit directory/" performance anomaly, Linus Torvalds, (Fri Aug 10, 12:51 pm)
Re: Fix "git commit directory/" performance anomaly, Junio C Hamano, (Fri Aug 10, 2:31 pm)
Re: Fix "git commit directory/" performance anomaly, Linus Torvalds, (Fri Aug 10, 2:56 pm)
Re: Fix "git commit directory/" performance anomaly, Linus Torvalds, (Fri Aug 10, 1:14 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Fri Aug 10, 1:55 am)
Re: git and larger trees, not so fast?, Linus Torvalds, (Fri Aug 10, 11:49 am)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 8:04 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 5:37 pm)
Re: git and larger trees, not so fast?, Junio C Hamano, (Thu Aug 9, 2:00 pm)