From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 1 Feb 2007 12:12:41 +0000 (-0800)
Subject: git-svn: get rid of revisions_eq check for --follow-parent
X-Git-Tag: v1.5.1-rc1~194
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef70de968509c447f5c02f4ba99f1cf0cadf5c1f;p=git.git

git-svn: get rid of revisions_eq check for --follow-parent

This was originally needed before we used the delta fetcher and
had a less-clean follow-parent implementation that could leave
holes in the history.

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

diff --git a/git-svn.perl b/git-svn.perl
index de14ed435..58d0600f8 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1059,16 +1059,6 @@ sub do_git_commit {
 	return $commit;
 }
 
-sub revisions_eq {
-	my ($self, $r0, $r1) = @_;
-	return 1 if $r0 == $r1;
-	my $nr = 0;
-	$self->ra->get_log([$self->{path}], $r0, $r1,
-	                   0, 0, 1, sub { $nr++ });
-	return 0 if ($nr > 1);
-	return 1;
-}
-
 sub find_parent_branch {
 	my ($self, $paths, $rev) = @_;
 	return undef unless $_follow_parent;
@@ -1132,7 +1122,7 @@ sub find_parent_branch {
 		$gs->fetch(0, $r);
 		($r0, $parent) = $gs->last_rev_commit;
 	}
-	if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) {
+	if (defined $r0 && defined $parent) {
 		print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
 		$self->assert_index_clean($parent);
 		my $ed;