Code

git-svn: Remove obsolete MAXPARENT check
authorAndrew Myrick <amyrick@apple.com>
Mon, 21 Dec 2009 22:22:54 +0000 (14:22 -0800)
committerEric Wong <normalperson@yhbt.net>
Mon, 21 Dec 2009 22:33:50 +0000 (14:33 -0800)
Change git-svn not to impose a limit of 16 parents on a merge.

This limit in git-svn artificially prevents cloning svn repositories
that contain commits with more than 16 merge parents.

The limit was removed from builtin-commit-tree.c for git v1.6.0 in commit
ef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it
it in git-svn.

Signed-off-by: Andrew Myrick <amyrick@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
git-svn.perl

index 4ea3ac63da266add573febff600a48a1a3aa2a1d..36709607f2d3865cea3b607851d8db478eebdf3a 100755 (executable)
@@ -2451,12 +2451,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;
 }