From: Johannes Sixt <j.sixt@viscovery.net>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Johan Herland <johan@herland.net>,
Jonathan del Strother <maillist@steelskies.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [RFD] Making "git push [--force/--delete]" safer?
Date: Wed, 03 Jul 2013 14:06:18 +0200 [thread overview]
Message-ID: <51D413BA.6080709@viscovery.net> (raw)
In-Reply-To: <51D40203.1010100@alum.mit.edu>
Am 7/3/2013 12:50, schrieb Michael Haggerty:
> On 07/03/2013 12:11 PM, Johan Herland wrote:
>> On Wed, Jul 3, 2013 at 12:06 PM, Jonathan del Strother
>> <maillist@steelskies.com> wrote:
>>> I'm struggling to think of instances where I wouldn't want this
>>> CAS-like behaviour. Wouldn't it be better to make it the default when
>>> pushing, and allowing the current behaviour with "git push
>>> --blind-force" or something?
>>
>> I believe I agree with you. I guess the reason this hasn't come up
>> before is that by far most of the pushes we do are either
>> fast-forwarding, or pushing into a non-shared repo (e.g. my own public
>> repo), and this safety only really applies when we're forcing a
>> non-fast-forward push into a shared repo...
>
> I didn't see Jonathan's original email but I was having exactly the same
> though as him (and was even going to propose the same option name).
>
> Non-ff pushing without knowing what you are going to overwrite is
> irresponsible in most scenarios, and (if backwards-compatibility
> concerns can be overcome) I think it would be quite prudent to forbid a
> non-ff push if there is no local remote-tracking branch that is
> up-to-date at the time of the push. Circumventing that check should
> require some extra-super-force option.
I don't think that is necessary. We already have *two* options to
force-push a ref: the + in front of refspec, and --force.
IMO, the meaning of + should be changed to "force-push with safety", and
--force can then be used to override if the safety triggers (i.e., --force
is your extra-super-force option).
-- Hannes
next prev parent reply other threads:[~2013-07-03 12:06 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-02 20:57 [RFD] Making "git push [--force/--delete]" safer? Junio C Hamano
2013-07-02 22:55 ` Johan Herland
2013-07-03 6:34 ` Johan Herland
2013-07-03 8:49 ` Junio C Hamano
2013-07-03 10:00 ` Johan Herland
2013-07-03 10:06 ` Jonathan del Strother
2013-07-03 10:11 ` Johan Herland
2013-07-03 10:50 ` Michael Haggerty
2013-07-03 12:06 ` Johannes Sixt [this message]
2013-07-03 19:53 ` Junio C Hamano
2013-07-04 5:37 ` Johannes Sixt
2013-07-04 5:46 ` Junio C Hamano
2013-07-03 19:50 ` Junio C Hamano
2013-07-03 20:18 ` Junio C Hamano
2013-07-03 19:48 ` Junio C Hamano
2013-07-09 19:53 ` [PATCH 0/7] safer "push --force" with compare-and-swap Junio C Hamano
2013-07-09 19:53 ` [PATCH 1/7] cache.h: move remote/connect API out of it Junio C Hamano
2013-07-09 19:53 ` [PATCH 2/7] builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN Junio C Hamano
2013-07-09 19:53 ` [PATCH 3/7] push: beginning of compare-and-swap "force/delete safety" Junio C Hamano
2013-07-09 19:53 ` [PATCH 4/7] remote.c: add command line option parser for --lockref Junio C Hamano
2013-07-16 22:13 ` John Keeping
2013-07-17 17:06 ` Junio C Hamano
2013-07-17 17:09 ` Junio C Hamano
2013-07-09 19:53 ` [PATCH 5/7] push --lockref: implement logic to populate old_sha1_expect[] Junio C Hamano
2013-07-09 19:53 ` [PATCH 6/7] t5533: test "push --lockref" Junio C Hamano
2013-07-09 19:53 ` [PATCH 7/7] push: document --lockref Junio C Hamano
2013-07-09 20:17 ` Aaron Schrab
2013-07-09 20:39 ` Junio C Hamano
2013-07-09 20:24 ` Johannes Sixt
2013-07-09 20:37 ` Junio C Hamano
2013-07-09 20:55 ` Johannes Sixt
2013-07-09 22:09 ` Junio C Hamano
2013-07-09 23:08 ` Junio C Hamano
2013-07-11 21:10 ` Johannes Sixt
2013-07-11 21:57 ` Junio C Hamano
2013-07-11 22:14 ` Junio C Hamano
2013-07-12 17:21 ` Johannes Sixt
2013-07-12 17:40 ` Junio C Hamano
2013-07-12 20:00 ` Johannes Sixt
2013-07-12 21:19 ` Junio C Hamano
2013-07-13 6:52 ` Johannes Sixt
2013-07-13 18:14 ` Junio C Hamano
2013-07-13 20:08 ` Junio C Hamano
2013-07-13 21:11 ` Johannes Sixt
2013-07-14 14:28 ` John Keeping
2013-07-13 20:17 ` Johannes Sixt
2013-07-14 19:17 ` Junio C Hamano
2013-07-14 20:21 ` Johannes Sixt
2013-07-14 20:34 ` Jonathan Nieder
2013-07-14 20:49 ` Jonathan Nieder
2013-07-14 20:59 ` Johannes Sixt
2013-07-14 21:28 ` Jonathan Nieder
2013-07-15 4:10 ` Junio C Hamano
2013-07-15 4:44 ` Jonathan Nieder
2013-07-15 15:37 ` Junio C Hamano
2013-07-15 20:30 ` Johannes Sixt
2013-07-15 3:50 ` Junio C Hamano
2013-07-15 15:47 ` Default expectation of --lockref Junio C Hamano
2013-07-15 20:27 ` [PATCH 7/7] push: document --lockref Johannes Sixt
2013-07-09 21:37 ` Marc Branchaud
2013-07-09 20:27 ` Michael Haggerty
2013-07-09 20:42 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51D413BA.6080709@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=maillist@steelskies.com \
--cc=mhagger@alum.mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).