Re: git merging

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Jun 20, 2005, 16:06 UTC
Message-ID: <Pine.LNX.4.21.0506201156360.30848-100000@iabervon.org>
In-Reply-To: <Pine.LNX.4.58.0506200844420.2268@ppc970.osdl.org>

On Mon, 20 Jun 2005, Linus Torvalds wrote:

Show 5 quoted lines

> Daniel: I think git-ssh-pull has problems with any refs that aren't
> commits. I also noticed earlier that I can't use git-ssh-push -w to write
> a tag - it is apparently unhappy because it would write a "tag" object,
> and it only wants to write references to "commit" objects. The same thing
> might be true about the special "tag to a tree" object?

You're correct; it's actually that pull.c has never gotten extended to look at the object you specify, determine what it is, and then behave appropriately. Basically, it needs a "process_unknown()" which does the appropriate thing, and pull() needs to call that instead of process_commit(). It should also get a "process_tag()" which handles tags (calling process_unknown() on their objects). I should be able to do it Tuesday evening or Wednesday night, if nobody else gets it before then.

	-Daniel
*This .sig left intentionally blank*