Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 4ea3ac63da266add573febff600a48a1a3aa2a1d..650c9e5f02ead07351629d6572e82c3a9ac7ef92 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -663,7 +663,8 @@ sub cmd_branch {
        }
        $head ||= 'HEAD';
 
-       my ($src, $rev, undef, $gs) = working_head_info($head);
+       my (undef, $rev, undef, $gs) = working_head_info($head);
+       my $src = $gs->full_url;
 
        my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
        my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
@@ -2451,12 +2452,6 @@ sub get_commit_parents {
                next if $seen{$p};
                $seen{$p} = 1;
                push @ret, $p;
-               # MAXPARENT is defined to 16 in commit-tree.c:
-               last if @ret >= 16;
-       }
-       if (@tmp) {
-               die "r$log_entry->{revision}: No room for parents:\n\t",
-                   join("\n\t", @tmp), "\n";
        }
        @ret;
 }
@@ -3169,7 +3164,8 @@ sub find_extra_svn_parents {
                                next unless $new_parents[$i];
                                next unless $new_parents[$j];
                                my $revs = command_oneline(
-                                       "rev-list", "-1", "$i..$j",
+                                       "rev-list", "-1",
+                                       "$new_parents[$i]..$new_parents[$j]",
                                       );
                                if ( !$revs ) {
                                        undef($new_parents[$i]);