Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: cannot handle more than 29 refs

From: Jon Nelson <hidden>
Date: 2016-06-15 22:42:15

On Tue, 27 Dec 2005, Linus Torvalds wrote:

On Tue, 27 Dec 2005, Jon Nelson wrote:
quoted
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 [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help