From: Andrew Myrick <amyrick@apple.com>
To: git@vger.kernel.org
Cc: sam@vilain.net, normalperson@yhbt.net, Andrew Myrick <amyrick@apple.com>
Subject: [PATCH] git-svn: Remove obsolete MAXPARENT check
Date: Mon, 21 Dec 2009 14:22:54 -0800 [thread overview]
Message-ID: <1261434174-298-1-git-send-email-amyrick@apple.com> (raw)
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(-)
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
next reply other threads:[~2009-12-21 22:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-21 22:22 Andrew Myrick [this message]
2009-12-21 22:39 ` [PATCH] git-svn: Remove obsolete MAXPARENT check Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261434174-298-1-git-send-email-amyrick@apple.com \
--to=amyrick@apple.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=sam@vilain.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox