From: Emma Turner via Guix-patches via <guix-patches@gnu.org>
To: Maxime Devos <maximedevos@telenet.be>
Cc: 57910@debbugs.gnu.org, 57909@debbugs.gnu.org
Subject: [bug#57910] [bug#57909] Add link to 'pre-inst-env' from 'installing from git' docs
Date: Mon, 19 Sep 2022 08:12:04 +0200 (CEST) [thread overview]
Message-ID: <NCJMztP--3-2@tutanota.com> (raw)
In-Reply-To: <975274c2-e4da-e310-8a88-731e7c429828@telenet.be>
[-- Attachment #1: Type: text/plain, Size: 901 bytes --]
Hi Maxime,
Thanks for your replies. I hadn't thought about the issue with make authenticate, but makes complete sense! Thanks for explaining.
I've attached an updated patch, which I think does what you asked for (replacing make authenticate with guix git authenticate.
Many thanks,
Emma
Sep 18, 2022, 19:53 by maximedevos@telenet.be:
>
>
> On 18-09-2022 19:26, Maxime Devos wrote:
>
>> [...]
>>
>> As such, I propose that:
>>
>> * you adjust the patch to note that authenticating the checkout is
>> impossible if you don't already have Guix installed (instead of
>> recommending the insecure "make authenticate")
>>
>> * I write a patch removing "make authenticate" and adjusting old uses
>> of "make authenticate" to "guix git authenticate ...".
>>
>
>
> I have attached a patch for the latter.
>
> Greetings,
> Maxime.
>
[-- Attachment #2: 0001-doc-contrib-recommend-guix-git-authenticate.patch --]
[-- Type: text/x-patch, Size: 2018 bytes --]
From f30716273f949d5883b7ced5c65ed5d48697479e Mon Sep 17 00:00:00 2001
From: Emma Turner <em.turner@tutanota.com>
Date: Mon, 19 Sep 2022 06:59:25 +0100
Subject: [PATCH] doc: contrib: recommend guix git authenticate
* doc/contributing.texi (Building from git): recommend use of guix git
authenticate on every git pull
---
doc/contributing.texi | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 17a54f94cc..4fbef71fe7 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -152,29 +152,12 @@ If anything fails, take a look at installation instructions
(@pxref{Installation}) or send a message to the
@email{guix-devel@@gnu.org, mailing list}.
-From there on, you can authenticate all the commits included in your
-checkout by running:
-
-@example
-make authenticate
-@end example
-
-The first run takes a couple of minutes, but subsequent runs are faster.
-
-Or, when your configuration for your local Git repository doesn't match
-the default one, you can provide the reference for the @code{keyring}
-branch through the variable @code{GUIX_GIT_KEYRING}. The following
-example assumes that you have a Git remote called @samp{myremote}
-pointing to the official repository:
-
-@example
-make authenticate GUIX_GIT_KEYRING=myremote/keyring
-@end example
-
@quotation Note
-You are advised to run @command{make authenticate} after every
-@command{git pull} invocation. This ensures you keep receiving valid
-changes to the repository.
+As with the initial clone, you are advised to run @command{guix git authenticate}
+after every @command{git pull} invocation. This ensures you keep receiving valid
+changes to the repository (@pxref{Invoking guix git authenticate}).
+
+You will not be able to do this unless you already have Guix installed.
@end quotation
After updating the repository, @command{make} might fail with an error
base-commit: f7565101e49102da6f87ad92e4644ae7996515ab
--
2.36.1
next prev parent reply other threads:[~2022-09-19 6:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-18 11:47 [bug#57909] Add link to 'pre-inst-env' from 'installing from git' docs Emma Turner via Guix-patches via
2022-09-18 12:41 ` [bug#57910] [PATCH] " Emma Turner via Guix-patches via
2022-09-19 9:37 ` Emma Turner via Guix-patches via
2022-09-18 14:59 ` bug#57909: Sorry - accidentally opened duplicate issues Emma Turner via Guix-patches via
2022-09-19 13:01 ` [bug#57909] " Maxime Devos
2022-09-18 17:26 ` [bug#57910] [bug#57909] Add link to 'pre-inst-env' from 'installing from git' docs Maxime Devos
2022-09-18 18:53 ` Maxime Devos
2022-09-19 6:12 ` Emma Turner via Guix-patches via [this message]
2022-09-19 13:27 ` Maxime Devos
2022-09-24 15:58 ` [bug#57909] bug#57910: [PATCH] " Ludovic Courtès
2022-09-24 16:23 ` Maxime Devos
2022-09-25 20:05 ` Ludovic Courtès
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=NCJMztP--3-2@tutanota.com \
--to=guix-patches@gnu.org \
--cc=57909@debbugs.gnu.org \
--cc=57910@debbugs.gnu.org \
--cc=em.turner@tutanota.com \
--cc=maximedevos@telenet.be \
/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).