diff options
author | Eric Wong <normalperson@yhbt.net> | 2007-02-01 15:12:41 +0300 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 11:57:11 +0300 |
commit | ef70de968509c447f5c02f4ba99f1cf0cadf5c1f (patch) | |
tree | 0acdafb7e01352b08989a4ee7ec6292f3e495df1 /git-svn.perl | |
parent | 471bc000528cf49928dae8872609b7fefc0c59ee (diff) |
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-x | git-svn.perl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/git-svn.perl b/git-svn.perl index de14ed4357..58d0600f89 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; |