{"thread":{"id":"22001","subject":"[PATCH] git-svn: Remove obsolete MAXPARENT check","startedAt":"2009-12-21T22:22:54Z","lastAt":"2009-12-21T22:39:18Z","messageCount":2,"participants":["Andrew Myrick","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"130226","messageId":"1261434174-298-1-git-send-email-amyrick@apple.com","threadId":"22001","inReplyTo":null,"subject":"[PATCH] git-svn: Remove obsolete MAXPARENT check","fromName":"Andrew Myrick","fromEmail":"amyrick@apple.com","sentAt":"2009-12-21T22:22:54Z","receivedAt":"2009-12-21T22:22:54Z","isPatch":true,"sender":{"key":"amyrick@apple.com","avatar":"https://avatars.githubusercontent.com/u/303045?v=4"},"body":"Change git-svn not to impose a limit of 16 parents on a merge.\n\nThis limit in git-svn artificially prevents cloning svn repositories\nthat contain commits with more than 16 merge parents.\n\nThe limit was removed from builtin-commit-tree.c for git v1.6.0 in commit\nef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it\nit in git-svn.\n\nSigned-off-by: Andrew Myrick <amyrick@apple.com>\n---\n git-svn.perl |    6 ------\n 1 files changed, 0 insertions(+), 6 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 0a6460e..92c40da 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -2447,12 +2447,6 @@ sub get_commit_parents {\n \t\tnext if $seen{$p};\n \t\t$seen{$p} = 1;\n \t\tpush @ret, $p;\n-\t\t# MAXPARENT is defined to 16 in commit-tree.c:\n-\t\tlast if @ret >= 16;\n-\t}\n-\tif (@tmp) {\n-\t\tdie \"r$log_entry->{revision}: No room for parents:\\n\\t\",\n-\t\t    join(\"\\n\\t\", @tmp), \"\\n\";\n \t}\n \t@ret;\n }\n-- \n1.6.6.rc3.dirty\n"},{"id":"130227","messageId":"20091221223918.GA22872@dcvr.yhbt.net","threadId":"22001","inReplyTo":"1261434174-298-1-git-send-email-amyrick@apple.com","subject":"Re: [PATCH] git-svn: Remove obsolete MAXPARENT check","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-12-21T22:39:18Z","receivedAt":"2009-12-21T22:39:18Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Andrew Myrick <amyrick@apple.com> wrote:\n> Change git-svn not to impose a limit of 16 parents on a merge.\n> \n> This limit in git-svn artificially prevents cloning svn repositories\n> that contain commits with more than 16 merge parents.\n> \n> The limit was removed from builtin-commit-tree.c for git v1.6.0 in commit\n> ef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it\n> it in git-svn.\n> \n> Signed-off-by: Andrew Myrick <amyrick@apple.com>\n\nThanks Andrew,\n\nAcked-by: Eric Wong <normalperson@yhbt.net>\n\nand pushed out to git://git.bogomips.org/git-svn along with the\nrest of the stuff already pushed out last night.\n\nAndrew Myrick (1):\n      git-svn: Remove obsolete MAXPARENT check\n\nEric Wong (2):\n      git svn: fix --revision when fetching deleted paths\n      update release notes for git svn in 1.6.6\n\nSam Vilain (5):\n      git-svn: expand the svn mergeinfo test suite, highlighting some failures\n      git-svn: memoize conversion of SVN merge ticket info to git commit ranges\n      git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges\n      git-svn: exclude already merged tips using one rev-list call\n      git-svn: detect cherry-picks correctly.\n\n-- \nEric Wong\n"}]}