diff options
author | Andrew Myrick <amyrick@apple.com> | 2009-12-21 14:22:54 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-12-21 14:33:50 -0800 |
commit | 063681d72e60e80cd14576037728b395ed42e330 (patch) | |
tree | 4b58f35c371d64a9c24e3fba2ed565b0b34f76a4 /git-svn.perl | |
parent | 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee (diff) | |
download | git-063681d72e60e80cd14576037728b395ed42e330.tar.gz |
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-x | git-svn.perl | 6 |
1 files changed, 0 insertions, 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; } |