From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KJE5K4wJ+2WLcQAA62LTzQ:P1 (envelope-from ) for ; Wed, 20 Mar 2024 17:06:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id KJE5K4wJ+2WLcQAA62LTzQ (envelope-from ) for ; Wed, 20 Mar 2024 17:06:36 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pdDHa7Np; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710950796; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LHuwsTddY32M5g2n2z8DZIhwGj95xQWPkEAfdldEGKM=; b=M7JTsPQsurhAYgMCJf57fYcT9u3DZDCa5mgmYGJXQAMiVlXQqzHlraiW1HKRdzo/w28xRO GIPKU7WdhLBKHFqQeD3+OMG7T6eR9jqm/xb4GeFcmLReBSqdXO/TlZHuE0vSQ107v4F9xy Z6GfME967CQdQVmv/C0tvFArlBiTEw1y3uzXqRtrpeD1tkiPTcFCeTnzPF0GHw9idxYylB 8v113/kzd+jiun6zXcw84hRXwdEKxodEqWPt9mftXkH5r4XspIi23wiW9TOVAqbgAaV0nJ QjEv63ZnPvRyEoMqvydEdYMedlTfvgv1rtRdi63sMuA0wVjRenVPITk9l3ffcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pdDHa7Np; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710950796; a=rsa-sha256; cv=none; b=s/IdGOc5TPgJ1j4OywtP5FvZklgeyHv91OlcZ0+2tM+Tc7aoQ0iqyMZYnCLX8HaCrj8hzC U9Zy7otkMIHgKr2VhpWH+qjwKkKhfkMaCL0fZDWfD+IQuExTjOi1WnYWuNa6lWyNYBnPz/ FKoSHuUzb3sNGK8H9qypGcxwM/Q+oNbHx0CEItKpnHQJnFFgIJ8u9XnKmi51rycnxTstzw 5CwK0K0MuICq4ubo0oseQe5oqUgSqatkVNpgzB064z2tmpdPAoz7l6ztFMeMZIGzgU4AMj DN/0F8pVZbL+nGukqCxLkvt/baaBZ5xcCkutTi716daCFB17bVfa8UHH4XcP5A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5C068332DB for ; Wed, 20 Mar 2024 17:06:36 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmySO-0000hC-Io; Wed, 20 Mar 2024 12:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmySM-0000ge-MY for guix-patches@gnu.org; Wed, 20 Mar 2024 12:06:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmySM-0001mo-EN for guix-patches@gnu.org; Wed, 20 Mar 2024 12:06:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rmySz-0000dG-QG for guix-patches@gnu.org; Wed, 20 Mar 2024 12:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69780] [PATCH 1/4] git authenticate: Record introduction and keyring in =?UTF-8?Q?=E2=80=98.git/config=E2=80=99.?= Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 16:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tomas Volf <~@wolfsden.cz> Cc: 69780@debbugs.gnu.org Received: via spool by 69780-submit@debbugs.gnu.org id=B69780.17109507852379 (code B ref 69780); Wed, 20 Mar 2024 16:07:01 +0000 Received: (at 69780) by debbugs.gnu.org; 20 Mar 2024 16:06:25 +0000 Received: from localhost ([127.0.0.1]:48974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmySO-0000cI-PB for submit@debbugs.gnu.org; Wed, 20 Mar 2024 12:06:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmySL-0000c3-VW for 69780@debbugs.gnu.org; Wed, 20 Mar 2024 12:06:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmyPW-00019I-SO; Wed, 20 Mar 2024 12:03:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=LHuwsTddY32M5g2n2z8DZIhwGj95xQWPkEAfdldEGKM=; b=pdDHa7NpLJRRWcdfBEDR eMRMVR8hCQ7Hq17XqMQyHU+oJ5o9uvVuPEI+oF7XPNLXMm+uSBomgo7Qgl6IPtkYrHAFg5x6vb4qV 4jb7tRB7qUtCvOSFx5sVdG5EAJzpvufQM/wail1y/sMkQ9pNaoF1t8wFjGyROSEtGhKh367oJ5ARV T6f6VwvogqXVXtZADCbo9Cn0w5Ux4kHFVbkSVE7QUcNgD4VcexU/zXtiP9JSc2rl3so2pGd/RYjdf NLz+bbUW4Hare9ujIra2SDggZVJ4M1aQqi7cIMjjuiWWufIpyHgYLpBV6QuOQhV/4pjOk+Us472sl s5B1BfewSehAQw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87sf0m4a9s.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Tue, 19 Mar 2024 14:32:47 +0100") References: <40858e56cf55b27711d23add5f3cd2ccc6ea5c58.1710351278.git.ludo@gnu.org> <87sf0m4a9s.fsf@gnu.org> Date: Wed, 20 Mar 2024 17:03:23 +0100 Message-ID: <87frwk28ms.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -7.22 X-Spam-Score: -7.22 X-Migadu-Queue-Id: 5C068332DB X-Migadu-Scanner: mx12.migadu.com X-TUID: xPFqo8KFIHw4 Hi, Ludovic Court=C3=A8s 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/patc= h-1") >> $7 =3D "/home/xx/src/guix/.git/worktrees/orig/" >> scheme@(guile-user)> (repository-open $7) >> $8 =3D # >> scheme@(guile-user)> (repository-directory $8) >> $9 =3D "/home/xx/src/guix/.git/worktrees/orig/" >> scheme@(guile-user)> (in-vicinity $9 "config") >> $10 =3D "/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 =E2=80=9Cthe right way=E2=80=9D. But then we=E2=80=99ll h= ave to require that > newer version of Guile-Git. > > 2. Bail out when the =E2=80=98.git/config=E2=80=99 isn=E2=80=99t 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/b3be1dd752682b2b6c9a7c11c= cdbfc0f0b5cf4e7 https://gitlab.com/guile-git/guile-git/-/commit/d38c09230467ca5cca7faabb0= c3a43c61a1e2c05 I can cut a new Guile-Git release soonish and we=E2=80=99d use these new bindings. The only open issue left is branches: how to configure different introductions for different branches. I=E2=80=99m all ears! Ludo=E2=80=99.