Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15
DORMANTno replies

[PATCH] git-svn: Remove obsolete MAXPARENT check

From: Andrew Myrick <hidden>
Date: 2016-06-15 22:47:56
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 git-svn.perl |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 0a6460e..92c40da 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2447,12 +2447,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;
 }
-- 
1.6.6.rc3.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help