Re: [PATCH] push: disable lazy --force-with-lease by default

From: Jeff King <peff@peff.net>
Date: Jul 7, 2017, 09:42 UTC
Message-ID: <20170707094204.kk62baddjjqrgagh@sigill.intra.peff.net>
In-Reply-To: <1n8sh3u.1lsabkd1pislrwM%lists@haller-berlin.de>

On Fri, Jul 07, 2017 at 11:24:15AM +0200, Stefan Haller wrote:

Show 9 quoted lines

> > Let's disable the form that relies on the stability of remote-tracking
> > branches by default, and allow users who _know_ their remote-tracking
> > branches are stable to enable it with a configuration variable.
> 
> I'm wondering if people who claim they know they are safe really do.
> Elsewhere in the other thread somebody said "I only ever explicitly
> fetch, so I know I'm safe". Are you sure?
> 
> Consider this example:

Thanks, these are all really good examples.

I think another one is just:

  $ git fetch
  [time passes]
  $ git checkout branch
  $ git rebase -i
  [oops, I forgot to merge in the latest changes before rewriting]
  $ git push --force-with-lease

That doesn't even require a fetch/pull after you start working. It's simply a mismatch between reality and what the default assumes (that whatever you were working on incorporated the latest work from upstream).

-Peff