[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69780] [PATCH 1/4] git authenticate: Record introduction and keyrin
From: |
Ludovic Courtès |
Subject: |
[bug#69780] [PATCH 1/4] git authenticate: Record introduction and keyring in ‘.git/config’. |
Date: |
Wed, 20 Mar 2024 17:03:23 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Hi,
Ludovic Courtès <ludo@gnu.org> skribis:
> Tomas Volf <~@wolfsden.cz> skribis:
>
>>> +(define* (record-configuration repository
>>> + #:key commit signer keyring-reference)
>>> + "Record COMMIT, SIGNER, and KEYRING-REFERENCE in the 'config' file of
>>> +REPOSITORY."
>>> + (define directory
>>> + (repository-directory repository))
>>> +
>>> + (define config-file
>>> + (in-vicinity directory "config"))
>>
>> I do not think this will work with worktrees. It will create the config
>> file in
>> the worktree's git directory, but that file will be ignored by git.
>>
>> scheme@(guile-user)> (repository-discover "/home/xx/src/guix-wt/patch-1")
>> $7 = "/home/xx/src/guix/.git/worktrees/orig/"
>> scheme@(guile-user)> (repository-open $7)
>> $8 = #<git-repository 128cbe0>
>> scheme@(guile-user)> (repository-directory $8)
>> $9 = "/home/xx/src/guix/.git/worktrees/orig/"
>> scheme@(guile-user)> (in-vicinity $9 "config")
>> $10 = "/home/xx/src/guix/.git/worktrees/orig/config"
>>
>> The $10 should be "/home/xx/src/guix/.git/config" instead.
>
> Damn it. So hmm, I can see two options:
>
> 1. Add more bindings to (git config) in Guile-Git so we can populate
> that file “the right way”. But then we’ll have to require that
> newer version of Guile-Git.
>
> 2. Bail out when the ‘.git/config’ isn’t found, as in the case of
> worktrees; we can change that to use the proper (git config)
> eventually.
>
> Maybe we should go straight to #1 though. Thoughts?
Done:
https://gitlab.com/guile-git/guile-git/-/commit/b3be1dd752682b2b6c9a7c11ccdbfc0f0b5cf4e7
https://gitlab.com/guile-git/guile-git/-/commit/d38c09230467ca5cca7faabb0c3a43c61a1e2c05
I can cut a new Guile-Git release soonish and we’d use these new
bindings.
The only open issue left is branches: how to configure different
introductions for different branches. I’m all ears!
Ludo’.
[bug#69780] [PATCH 4/4] DRAFT news: Add entry for ‘guix git authenticate’ changes., Ludovic Courtès, 2024/03/13