Re: Please undo "Use git-merge instead of git-resolve in

From: Sean <seanlkml@sympatico.ca>
Date: Sep 22, 2005, 22:54 UTC
Message-ID: <BAYC1-PASMTP0529AB50E9E3F8BACFE1EFAE970@CEZ.ICE>
In-Reply-To: <7vk6h8lp3k.fsf@assigned-by-dhcp.cox.net>

On Thu, September 22, 2005 6:22 pm, Junio C Hamano said:

Show 8 quoted lines

> "Sean" <seanlkml@sympatico.ca> writes:
>
>> Why doesn't cogito just use the git fetch/pull commands?   Why does it
>> need anything special?   It seems like cogito is doing more than just
>> being an ease-of-use layer above git.
>
> The way this question is posed is quite unfair to Pasky -- it
> makes him look needlessly bad.

Will try to pose it differently then, because it was not meant to make him "look bad". In a different email Pasky seemed to be musing that cogito might do away with fast forward merges. This too seemed like a decision best left to the plumbing, so i have been wondering how Pasky views cogito's relationship to git.

But the immediate question really was, wouldn't it be better if cogito used the same code paths that git uses for push/pull/fetch? Is there a reason that this isn't possible?

Show 5 quoted lines

> The simple reason is because Cogito had its own richer
> fetch/pull first.  The development of git aware pack transfer
> protocols by Linus and the list discussion for multi-head pushes
> and pulls came much later, which resulted in the current 'git
> fetch/pull' interface.

Yes, cogito had it first but once this functionality gets pushed down into git (where it's been for a while now) it makes a lot of sense for the procelain layers to use it. That way the functionality only has to be maintained in one place and nobody has to guess what transports work with cogito or git etc. But perhaps there are reasons that this just isn't possible with the cogito code, i dunno.

Sean