git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Scott Johnson" <jaywir3@gmail.com>,
	git@vger.kernel.org, "Constantin Weißer" <i7c@posteo.de>
Subject: Re: Would a config var for --force-with-lease be useful?
Date: Mon, 27 Aug 2018 13:09:04 -0700	[thread overview]
Message-ID: <xmqqlg8rinbz.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <87o9dnegxi.fsf@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Mon, 27 Aug 2018 21:40:57 +0200")

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> This was after/during a long discussion starting with:
> https://public-inbox.org/git/CACBZZX7MeX-6RHgh2Fa9+YL03mjxs8xmyE86HnVxBxjMYizcig@mail.gmail.com/
>
> It appears the only patch that got in from that discussion was my
> f17d642d3b ("push: document & test --force-with-lease with multiple
> remotes", 2017-04-19) (https://github.com/git/git/commit/f17d642d3b)

Thanks for pointing at the old thread.

As far as our documentation is concerned, the invitation to improve
the situation, offered in "git push --help", is still valid:

    Note that all forms other than `--force-with-lease=<refname>:<expect>`
    that specifies the expected current value of the ref explicitly are
    still experimental and their semantics may change as we gain experience
    with this feature.

But I do not think (and I did not think back then) there is a magic
bullet to make the lazy force-with-lease automatically safe for
everybody, so it may be time to declare that the lazy force-with-lease
was a failed experiment and move on, with a patch like the one
suggested last year in the message:

  https://public-inbox.org/git/xmqq37a9fl8a.fsf_-_@gitster.mtv.corp.google.com/


  reply	other threads:[~2018-08-27 20:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-24 16:39 Would a config var for --force-with-lease be useful? Scott Johnson
2018-08-25 13:34 ` Constantin Weißer
2018-08-27 21:21   ` Johannes Schindelin
2018-08-28  9:59     ` Phillip Wood
2018-08-27 19:24 ` Junio C Hamano
2018-08-27 19:40   ` Ævar Arnfjörð Bjarmason
2018-08-27 20:09     ` Junio C Hamano [this message]
2018-08-27 20:44       ` Ævar Arnfjörð Bjarmason
2018-08-27 22:29         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqlg8rinbz.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=i7c@posteo.de \
    --cc=jaywir3@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).