Re: Figured out how to get Mozilla into git

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 10, 2006, 03:08 UTC
Message-ID: <Pine.LNX.4.64.0606092001590.5498@g5.osdl.org>
In-Reply-To: <87y7w5lowc.wl%cworth@cworth.org>

On Fri, 9 Jun 2006, Carl Worth wrote:

Show 12 quoted lines

> On Fri, 9 Jun 2006 22:21:17 -0400, "Jon Smirl" wrote:
> > 
> > Could you clone the repo and delete changesets earlier than 2004? Then
> > I would clone the small repo and work with it. Later I decide I want
> > full history, can I pull from a full repository at that point and get
> > updated? That would need a flag to trigger it since I don't want full
> > history to come over if I am just getting updates from someone else's
> > tree that has a full history.
> 
> This is clearly a desirable feature, and has been requested by several
> people (including myself) looking to switch some large-ish histories
> from an existing system to git.

The thing is, to some degree it's really fundamentally hard.

It's easy for a linear history. What you do for a linear history is to just get the top commit, and the tree associated with it, and then you cauterize the parent by just grafting it to go away. Boom. You're done.

The problems are that if the preceding history _wasn't_ linear (or, in fact, _subsequent_ development refers to it by having branched off at an earlier point), and you try to pull your updates, the other end (that knows about all the history) will assume you have all the history that you don't have, and will send you a pack assuming that.

Which won't even necessarily have all the tree/blob objects (it assumed you already had them), but more annoyingly, the history won't be cauterized, and you'll have dangling commits. Which you can cauterize by hand, of course, but you literally _will_ have to get the objects and cauterize the thing by hand.

You're right that it's not "fundamentally impossible" to do: the git format certainly _allows_ it. But the git protocol handshake really does end up optimizing away all the unnecessary work by knowing that the other side will have all the shared history, so lacking the shared history will mean that you're a bit screwed.

Using the http protocol actually works. It doesn't do any handshake: it will just fetch objects from the other end as it needs them. The downside, of course, is that it also doesn't understand packs, so if the source is packed (and it pretty much _will_ be, for any big source), you're going to end up getting it all _anyway_.

		Linus