From patchwork Thu Jul 20 03:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 51855 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D30727BBE9; Thu, 20 Jul 2023 04:31:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 71C7027BBE2 for ; Thu, 20 Jul 2023 04:31:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMKNe-0008Ns-6v; Wed, 19 Jul 2023 23:31:06 -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 1qMKNc-0008Ne-GU for guix-patches@gnu.org; Wed, 19 Jul 2023 23:31:04 -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 1qMKNb-0002Gi-Ey; Wed, 19 Jul 2023 23:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMKNZ-00066d-RD; Wed, 19 Jul 2023 23:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64737] [PATCH 1/2] git: Clarify commit relation reference in doc. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 03:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64737@debbugs.gnu.org, maxim.cournoyer@gmail.com Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org, maxim.cournoyer@gmail.com X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.168982380723337 (code B ref -1); Thu, 20 Jul 2023 03:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 03:30:07 +0000 Received: from localhost ([127.0.0.1]:57407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMKMg-00064K-SU for submit@debbugs.gnu.org; Wed, 19 Jul 2023 23:30:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMKMb-00063J-NQ for submit@debbugs.gnu.org; Wed, 19 Jul 2023 23:30:04 -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 1qMKMV-0008Gu-1a for guix-patches@gnu.org; Wed, 19 Jul 2023 23:29:55 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qMKMT-0001yC-Lj for guix-patches@gnu.org; Wed, 19 Jul 2023 23:29:54 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-403a840dc64so3378391cf.1 for ; Wed, 19 Jul 2023 20:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689823792; x=1690428592; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3F/dP1pNvRjizmMf7gYUgVhLR/8fTyiWwdqVlOAJ1rE=; b=ZcWufrDZhc/MlPkuW0lmlt4XebJvQKOYkaAifK6seEJ4h/cbLU3lXGJFkXYe2BvbY8 lm1qITDMLNP7wpF2dcWpE45wUUEaWwli4EEhonalSzsdfOctZChISGufnhKIGQlKCfN/ /+U8bdeHeItDIr0+n3tzTaZObk3wB1mMXGRhoX8ItClcEL4kjVz33kPI/Tun/HXreNLr oeEpPUfB+atpFSQbH/FCbMoVcdCKFxrWWL6bbvuJVGWGoaBSOW2/buZdYoXSEUDlJxUS rqi59I6yFT6eQyN6GUuo8HklP14GNi3UNDQI68WIw1Kq4TEjAHKdmWtcyL/2CMFgSFct me4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689823792; x=1690428592; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3F/dP1pNvRjizmMf7gYUgVhLR/8fTyiWwdqVlOAJ1rE=; b=jq2xbF8CL9wiLLUk2O2BGMvgECAB+NSFLv2VQOG18d816ctKpXSXZEcBwXqYKHkqov 0yIMRBosv1jWTFpAq/Caq/QdGy4fgocWIL77Fd6nxtHIwq8EsqBFHDGq1OwOhXRAl+nR r+giHgFhhA8rcxDEnwyrHg/N0gQVe+XThO9d7OLvNJEhwLb+IpGTgpZMvL4MhOlG1juk g+/PWdUoumQYaJuqx58B9lM6QTKtdVkxXPt0ggDw+XRJ7vd3xwRguhnPujM14fof3bRx Q4vLVvFaXFhg+TCjtC/nRWVmIql5YHnIqt6t2+/GczJWwjmHEQsWQDzQsVQ2/ZlZnyqb kGzQ== X-Gm-Message-State: ABy/qLZxhipiIagDYTg7rd7s2Jg4rf+0IrrxTgLVU+nAyXE2VeLIPf7Z MfNMZ85LLesjH15Y50ZePfYIcwDFr2w= X-Google-Smtp-Source: APBJJlHUbyX9FAYOTXcbesdRRbe2AtMKBfiZUoN4K3rf88zhKnb+TkscBfoMF7I+pNOPFuCN7vR3yQ== X-Received: by 2002:a05:622a:30e:b0:403:8d8a:564e with SMTP id q14-20020a05622a030e00b004038d8a564emr1096606qtw.62.1689823791988; Wed, 19 Jul 2023 20:29:51 -0700 (PDT) Received: from localhost.localdomain (dsl-159-145.b2b2c.ca. [66.158.159.145]) by smtp.gmail.com with ESMTPSA id s15-20020ac8528f000000b003f9efa2ddb4sm31495qtn.66.2023.07.19.20.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 20:29:51 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 19 Jul 2023 23:28:49 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82c; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x82c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/git.scm (update-cached-checkout): Clarify that it is the relation of STARTING-COMMIT that is returned, relative to the new commit, not the other way around. --- guix/git.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 1d837aaa32a3a2de8f4a1ac391f92effba50834e diff --git a/guix/git.scm b/guix/git.scm index be20cde019..dbc3b7caa7 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -439,7 +439,7 @@ (define* (update-cached-checkout url #:recursive? recursive?))) "Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return three values: the cache directory name, and the SHA1 commit (a string) corresponding -to REF, and the relation of the new commit relative to STARTING-COMMIT (if +to REF, and the relation of STARTING-COMMIT relative to the new commit (if provided) as returned by 'commit-relation'. REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value