From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 10 Feb 2007 21:58:33 +0000 (-0800)
Subject: git-svn: remove optimized commit stuff for set-tree
X-Git-Tag: v1.5.1-rc1~180
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=490f49ea5899b7aacfb82c0ed5639d722a56704a;p=git.git

git-svn: remove optimized commit stuff for set-tree

I may resurrect it for dcommit at some point, but nobody really
uses set-tree anymore and I don't feel like introducing more
complexity into the code at this point.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 50b7dcf25..7e1a65525 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -48,7 +48,6 @@ BEGIN {
 
 my ($SVN);
 
-my $_optimize_commits = 1 unless $ENV{GIT_SVN_NO_OPTIMIZE_COMMITS};
 $sha1 = qr/[a-f\d]{40}/;
 $sha1_short = qr/[a-f\d]{4,40}/;
 my ($_stdin, $_help, $_edit,
@@ -1384,15 +1383,8 @@ sub fetch {
 
 sub set_tree_cb {
 	my ($self, $log_entry, $tree, $rev, $date, $author) = @_;
-	# TODO: enable and test optimized commits:
-	if (0 && $rev == ($self->{last_rev} + 1)) {
-		$log_entry->{revision} = $rev;
-		$log_entry->{author} = $author;
-		$self->do_git_commit($log_entry, "$rev=$tree");
-	} else {
-		$self->{inject_parents} = { $rev => $tree };
-		$self->fetch(undef, undef);
-	}
+	$self->{inject_parents} = { $rev => $tree };
+	$self->fetch(undef, undef);
 }
 
 sub set_tree {