[PATCH] git-svn: Remove obsolete MAXPARENT check

Andrew Myrick· Dec 21, 2009, 22:22 UTC · lore

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>
---
 git-svn.perl |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

Show changes to git-svn.perl +0 −6

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

Eric Wong· Dec 21, 2009, 22:39 UTC · re: Andrew Myrick · lore

Re: [PATCH] git-svn: Remove obsolete MAXPARENT check

Andrew Myrick <amyrick@apple.com> wrote:

Show 10 quoted lines

> 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>

Thanks Andrew,

Acked-by: Eric Wong <normalperson@yhbt.net>

and pushed out to git://git.bogomips.org/git-svn along with the rest of the stuff already pushed out last night.

Andrew Myrick (1):
      git-svn: Remove obsolete MAXPARENT check

Eric Wong (2):
      git svn: fix --revision when fetching deleted paths
      update release notes for git svn in 1.6.6

Sam Vilain (5):
      git-svn: expand the svn mergeinfo test suite, highlighting some failures
      git-svn: memoize conversion of SVN merge ticket info to git commit ranges
      git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges
      git-svn: exclude already merged tips using one rev-list call
      git-svn: detect cherry-picks correctly.

-- 
Eric Wong

patchgit-svn: Remove obsolete MAXPARENT check