Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

From: Jeff King <peff@peff.net>
Date: Apr 8, 2017, 22:03 UTC
Message-ID: <20170408220347.jcyatwegrjsxjeqo@sigill.intra.peff.net>
In-Reply-To: <1n469ch.1maczdmz3p8f2M%lists@haller-berlin.de>

On Sat, Apr 08, 2017 at 05:03:06PM +0200, Stefan Haller wrote:

Show 9 quoted lines

> Jeff King <peff@peff.net> wrote:
> 
> > I think Matt's point is just that the default, to use origin/branch, is
> > unsafe. It's convenient when you don't have extra fetches, but that
> > convenience may not be worth the potential surprise.
> 
> I don't think "surprise" is the right word here. The point of
> --force-with-lease is to provide a guarantee, so if you can't trust the
> guarantee, it makes the feature rather pointless.

You can trust it under a certain set of conditions. If you break those conditions, it doesn't work. So that's why I said "surprise": most users aren't going to be aware of those conditions.

But I also used the word "unsafe". That, or "dangerous", is certainly accurate. And I don't at all disagree that the situation should be improved.

-Peff