unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: HiPhish <hiphish@posteo.de>
Cc: guix-devel@gnu.org
Subject: Re: Questions about Git and workflow
Date: Tue, 18 Aug 2020 16:33:53 -0400	[thread overview]
Message-ID: <20200818203353.GA26961@jasmine.lan> (raw)
In-Reply-To: <2818350.e9J7NaK4W3@ixtreme-m5740>

On Tue, Aug 18, 2020 at 08:38:39PM +0200, HiPhish wrote:
> My first question is regarding `guix git authenticate`. The first time I ran it 
> after a `git clone ...` and `guix environment guix` I got an error saying that 
> the `keyring` branch cannot be found. So I did a `git checkout --track origin/
> keyring`, but I got a different error instead:
> 
>     $ guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad "BBB0 
> 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"
>     Authenticating commits 9edb3f6 to ec32c85 (3 new commits)...
>     guix git: error: commit ec32c8591eb111023db514800145532a1e454125 not 
> signed by an authorized key: F5DA 2032 4B87 3D0B 7A38  7672 0DB0 FF88 4F55 
> 6D79
> 
> Finally I did a `git pull` on both the `keyring` and the `master` branch and 
> the check passed.
> 
> So my first question is: did I do it correctly? If not, what is the correct 
> workflow?

It sounds like you did it correctly. After bringing the 'keyring' branch
up to date, the authentication succeeded. If you want to explore more,
compare the keyring branch before and after you updated it.

> My second question is regarding the `.po` files which get changed during the 
> build process. Git shows me a number of language-specific files as modified, even 
> though I never touched them by hand. Should those changes be commited? Should 
> I include them when I send a patch? Why are they even version-controlled if 
> they get changed automatically?

I ignore these changes. When they occur I do `git checkout po` to erase
them. I don't really know what's "correct" here but we can expect some
minor annoyances like this in the development environment.

> My last question is about the local state directory. The manual says the pass 
> my current local state directory (by default `/var`) to `./configure`, but then 
> my store gets mutated. I would prefer not to store my weird experiments where 
> my day-to-day packages lie. I know I can revert at any time, but I'd rather 
> not. I instead created `./var` and passed `$(pwd)/var` to `./configure`. The 
> question is, is this the way to go? When I tried building a package (`/pre-
> inst-env guix install go-github-com-junegunn-fzf`) Guix complained that there 
> was no deamon running, so do I need a second shell running the deamon (`sudo -
> E ./pre-inst-env guix-daemon --build-users-group=guixbuild`) as well?

I recommend not using a different local state directory. There should
not be any negative (or even observable) effects of your experimental
artifacts being in /gnu/store. I haven't tried managing multiple stores
but I assume you'd need to run a separate daemon for each, configured
for the correct directories.


  reply	other threads:[~2020-08-18 20:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-18 18:38 Questions about Git and workflow HiPhish
2020-08-18 20:33 ` Leo Famulari [this message]
2020-08-21 20:51   ` HiPhish
2020-08-21 20:59     ` Ekaitz Zarraga
2020-08-23 21:19       ` HiPhish
2020-08-22  2:10     ` Leo Famulari
2020-08-18 21:43 ` Joshua Branson

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=20200818203353.GA26961@jasmine.lan \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    --cc=hiphish@posteo.de \
    /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).