Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: get rid of revisions_eq check for --follow-parent
author
Eric Wong
<normalperson@yhbt.net>
Thu, 1 Feb 2007 12:12:41 +0000
(
04:12
-0800)
committer
Eric Wong
<normalperson@yhbt.net>
Fri, 23 Feb 2007 08:57:11 +0000
(
00:57
-0800)
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>
git-svn.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
471bc00
)
diff --git
a/git-svn.perl
b/git-svn.perl
index de14ed435731b53d0a349f3f3ecf3446235ba164..58d0600f891bcdfe12479728b3d8760e339d5360 100755
(executable)
--- a/
git-svn.perl
+++ b/
git-svn.perl
@@
-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 {
my ($self, $paths, $rev) = @_;
return undef unless $_follow_parent;
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;
}
$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;
print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
$self->assert_index_clean($parent);
my $ed;