From: Junio C Hamano <gitster@pobox.com>
To: Chris Rorvick <chris@rorvick.com>
Cc: git@vger.kernel.org, Angelo Borsotti <angelo.borsotti@gmail.com>,
Drew Northup <n1xim.email@gmail.com>,
Michael Haggerty <mhagger@alum.mit.edu>,
Philip Oakley <philipoakley@iee.org>,
Johannes Sixt <j6t@kdbg.org>,
Kacper Kornet <draenog@pld-linux.org>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: [PATCH 5/7] push: require force for refs under refs/tags/
Date: Tue, 27 Nov 2012 09:12:45 -0800 [thread overview]
Message-ID: <7v7gp7nf5e.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAEUsAPZTycJS_USj-tYNN2Bpwn8XvYDTd4c7wFMFDYfNeSCUtw@mail.gmail.com> (Chris Rorvick's message of "Mon, 26 Nov 2012 22:17:49 -0600")
Chris Rorvick <chris@rorvick.com> writes:
> On Mon, Nov 26, 2012 at 12:57 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Chris Rorvick <chris@rorvick.com> writes:
>>
>>> diff --git a/remote.c b/remote.c
>>> index 4a6f822..012b52f 100644
>>> --- a/remote.c
>>> +++ b/remote.c
>>> @@ -1315,14 +1315,18 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
>>> *
>>> * (1) if the old thing does not exist, it is OK.
>>> *
>>> - * (2) if you do not have the old thing, you are not allowed
>>> + * (2) if the destination is under refs/tags/ you are
>>> + * not allowed to overwrite it; tags are expected
>>> + * to be static once created
>>> + *
>>> + * (3) if you do not have the old thing, you are not allowed
>>> * to overwrite it; you would not know what you are losing
>>> * otherwise.
>>> *
>>> - * (3) if both new and old are commit-ish, and new is a
>>> + * (4) if both new and old are commit-ish, and new is a
>>> * descendant of old, it is OK.
>>> *
>>> - * (4) regardless of all of the above, removing :B is
>>> + * (5) regardless of all of the above, removing :B is
>>> * always allowed.
>>> */
>>
>> We may want to reword (0) to make it clear that --force
>> (and +A:B) can be used to defeat all the other rules.
>
> On that note, having (5) be "regardless of all of the above ..." seems
> a little awkward. That would seem to fit better towards the top.
Sure. (0) you can always force; (1) you can always delete; and then
other requirements. That may indeed read better.
Thanks.
next prev parent reply other threads:[~2012-11-27 17:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-23 4:21 [PATCH v5 0/7] push: update remote tags only with force Chris Rorvick
2012-11-23 4:21 ` [PATCH 1/7] push: return reject reasons via a mask Chris Rorvick
2012-11-26 18:43 ` Junio C Hamano
2012-11-27 3:00 ` Chris Rorvick
2012-11-23 4:21 ` [PATCH 2/7] push: add advice for rejected tag reference Chris Rorvick
2012-11-23 4:21 ` [PATCH 3/7] push: flag updates Chris Rorvick
2012-11-23 4:21 ` [PATCH 4/7] push: flag updates that require force Chris Rorvick
2012-11-23 4:21 ` [PATCH 5/7] push: require force for refs under refs/tags/ Chris Rorvick
2012-11-26 18:57 ` Junio C Hamano
2012-11-27 4:17 ` Chris Rorvick
2012-11-27 17:12 ` Junio C Hamano [this message]
2012-11-28 5:18 ` [PATCH] push: cleanup push rules comment Chris Rorvick
2012-11-28 16:58 ` Junio C Hamano
2012-11-23 4:21 ` [PATCH 6/7] push: require force for annotated tags Chris Rorvick
2012-11-23 4:21 ` [PATCH 7/7] push: clarify rejection of update to non-commit-ish Chris Rorvick
2012-11-26 18:53 ` Junio C Hamano
2012-11-27 3:52 ` Chris Rorvick
2012-11-27 17:11 ` 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=7v7gp7nf5e.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=angelo.borsotti@gmail.com \
--cc=chris@rorvick.com \
--cc=draenog@pld-linux.org \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mhagger@alum.mit.edu \
--cc=n1xim.email@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/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).