undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eric Wong 2007-02-01 04:12:41 -08:00
parent 471bc00052
commit ef70de9685
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-svn.perl
View File

@ -1059,16 +1059,6 @@ sub do_git_commit {
return $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 { sub find_parent_branch {
my ($self, $paths, $rev) = @_; my ($self, $paths, $rev) = @_;
return undef unless $_follow_parent; return undef unless $_follow_parent;
@ -1132,7 +1122,7 @@ sub find_parent_branch {
$gs->fetch(0, $r); $gs->fetch(0, $r);
($r0, $parent) = $gs->last_rev_commit; ($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"; print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
$self->assert_index_clean($parent); $self->assert_index_clean($parent);
my $ed; my $ed;