From 063681d72e60e80cd14576037728b395ed42e330 Mon Sep 17 00:00:00 2001 From: Andrew Myrick Date: Mon, 21 Dec 2009 14:22:54 -0800 Subject: [PATCH] git-svn: Remove obsolete MAXPARENT check 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 Acked-by: Eric Wong --- git-svn.perl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 4ea3ac63da..36709607f2 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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; }