From: Andrew Myrick <amyrick@apple.com>
Date: Mon, 21 Dec 2009 22:22:54 +0000 (-0800)
Subject: git-svn: Remove obsolete MAXPARENT check
X-Git-Tag: v1.6.6~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=063681d72e60e80cd14576037728b395ed42e330;p=git.git

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 <amyrick@apple.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 4ea3ac63d..36709607f 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;
 }