From: Mark H Weaver <mhw@netris.org>
To: "Jakub Kądziołka" <kuba@kadziolka.net>,
"Leo Famulari" <leo@famulari.name>
Cc: guix-devel@gnu.org, mail@nicolasgoaziou.fr
Subject: Re: branch staging updated (5aeee07 -> 104151f)
Date: Sun, 31 Jan 2021 16:09:01 -0500 [thread overview]
Message-ID: <875z3cu83b.fsf@netris.org> (raw)
In-Reply-To: <C8X97V8ZHOFG.1MH5GHRUX0BFI@gravity>
Hi,
Jakub Kądziołka <kuba@kadziolka.net> writes:
> On Sun Jan 31, 2021 at 6:18 AM CET, Leo Famulari wrote:
>> On Sat, Jan 30, 2021 at 06:37:11PM -0500, Mark H Weaver wrote:
>> > What would the Git hook do, precisely? The reason I ask is that some
>> > bug fixes are appropriate on a frozen branch. How would a Git hook
>> > determine whether a given commit should be allowed?
>>
>> I haven't given much thought to how it would work but, if it ran on the
>> client side as a pre-push hook, it could be easily disabled by the
>> committer, when necessary.
Ah, I see now that 'git push' has the "--no-verify" option, which causes
it to skip the pre-push hook. Sure, that sounds workable.
> Alternatively, one could include some control sequence in the commit
> message. For example,
>
> Allow-Frozen: staging
It's an interesting idea, but it occurs to me that such annotations
would have no long-term relevance, and so I'd prefer not to pollute our
commit log history with them. A year from now, it's unlikely to be
relevant whether a bug fix pushed today happened to be committed to the
'staging' branch when it was frozen. For our purposes, we only need a
transient way to disable the pre-push hook, whereas anything included in
the commit log is permanent and forever immutable.
Therefore, my preference would be to use the "--no-verify" option.
I could live with either approach, though.
What do you think?
Regards,
Mark
next prev parent reply other threads:[~2021-01-31 21:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210129220535.30446.38250@vcs0.savannah.gnu.org>
2021-01-30 23:20 ` branch staging updated (5aeee07 -> 104151f) Leo Famulari
2021-01-30 23:37 ` Mark H Weaver
2021-01-31 5:18 ` Leo Famulari
2021-01-31 9:59 ` Jakub Kądziołka
2021-01-31 21:09 ` Mark H Weaver [this message]
2021-02-01 11:14 ` Hartmut Goebel
2021-02-01 11:28 ` Efraim Flashner
2021-02-01 19:39 ` Mark H Weaver
2021-02-01 20:43 ` Christopher Baines
2021-02-01 20:56 ` Leo Famulari
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: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875z3cu83b.fsf@netris.org \
--to=mhw@netris.org \
--cc=guix-devel@gnu.org \
--cc=kuba@kadziolka.net \
--cc=leo@famulari.name \
--cc=mail@nicolasgoaziou.fr \
/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://git.savannah.gnu.org/cgit/guix.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).