Re: [PATCH 10/10] push: teach push to be quiet if local ref is strict subset of remote ref

From: Andreas Ericsson <ae@op5.se>
Date: Nov 1, 2007, 08:18 UTC
Message-ID: <47298BD7.2000902@op5.se>
In-Reply-To: <7vlk9jgeee.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:

Show 18 quoted lines

> Steffen Prohaska <prohaska@zib.de> writes:
> 
>>> You forgot a lot more important part.  Pushing into publishing
>>> repositories.  And the discussion is about git-push command.
>> Exactly, here are two examples:
>>
>> If you push only to publishing repositories that are read
>> only by others, you'll never encounter the problem that
>> 10/10 tried to solve. The publishing repository is never
>> changed by others. You are the only one who pushes to this
>> repository. Therefore the remote never advances unexpectedly.
> 
> Wrong.
> 
> People can and do work from more than one private repositories
> (I do).  In a sense, that is sharing the repository with
> oneself.
>

I believe your troubles are alleviated a great deal by the fact that you actually know when upstream has changes, and what those changes are supposed to be. A communications breakdown with only one person involved is sort of hard to imagine.

> (actually, shared repository people seem to
> prefer "fetch + rebase" over "pull" which is "fetch + merge").
>

That's definitely true. The number of useless merge-commits we have in our repos is annoying, and has twice made bisect a bit troublesome for no good reason.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231