Re: cannot handle more than 29 refs
- From
- Jon Nelson <jnelson-git@jamponi.net>
- Date
- Dec 27, 2005, 20:49 UTC
- Message-ID
- <Pine.LNX.4.63.0512271448130.6812@gheavc.wnzcbav.cig>
- In-Reply-To
- <Pine.LNX.4.64.0512271113290.14098@g5.osdl.org>
On Tue, 27 Dec 2005, Linus Torvalds wrote:
Show 16 quoted lines
> > > On Tue, 27 Dec 2005, Jon Nelson wrote: > > > > I get this message whenever I use --tags with git-pull with certain > > repositories. > > You shouldn't "pull" tags. You should just "fetch" them. > > The error message comes from the fact that the pull is a "fetch + merge", > and the merge logic tries to figure out what the common parent is with > "git-show-branch". And the common parent finding is limited to 29 commits. > > (Which is a very reasonable limit: the normal case is 2, and doing an > octopus-merge with more than four or five parents is already insane. Much > less 30 parents).
^^^ Aha! I think I understand what's going on here - and you are right, I *don't* want to merge from all of those tags, I just want the content, so fetch is what I should be doing. Thanks!
-- Jon Nelson <jnelson-git@jamponi.net>