From patchwork Tue Aug 15 19:44:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52853 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 53C2727BBEC; Tue, 15 Aug 2023 20:46:29 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 3C00E27BBE9 for ; Tue, 15 Aug 2023 20:46:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVzzT-0002Qr-Pv; Tue, 15 Aug 2023 15:46:07 -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 1qVzzR-0002Q0-2j for guix-patches@gnu.org; Tue, 15 Aug 2023 15:46:05 -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 1qVzzQ-0007X0-Pz; Tue, 15 Aug 2023 15:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVzzN-0001mC-Jt; Tue, 15 Aug 2023 15:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64746] [PATCH v2 1/3] git: Clarify commit relation reference in doc. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@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: Tue, 15 Aug 2023 19:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64746 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64746@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 64746-submit@debbugs.gnu.org id=B64746.16921287126749 (code B ref 64746); Tue, 15 Aug 2023 19:46:01 +0000 Received: (at 64746) by debbugs.gnu.org; 15 Aug 2023 19:45:12 +0000 Received: from localhost ([127.0.0.1]:36661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVzya-0001kn-BK for submit@debbugs.gnu.org; Tue, 15 Aug 2023 15:45:12 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:51224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVzyW-0001k3-Gf for 64746@debbugs.gnu.org; Tue, 15 Aug 2023 15:45:11 -0400 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-40ff796e8ddso43112441cf.2 for <64746@debbugs.gnu.org>; Tue, 15 Aug 2023 12:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692128702; x=1692733502; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3QneMBPT8ky8lkuiPx8LP9V5ElnnO08mtoiDJKnEmD0=; b=fAUHj9hdVXt41KNA1UBVY1AloV6uhaS0UMPgbIEHRaO4JubOEUlCIDsS618Bw80mHi 00yTEaZHB307t5+YpHb6ZrliV23/nqy9kFwlWfpLkTJJ2rtVOtEQJSq1UBWmvAzBOsix G/IR/9prCsl9NswhKJ5k5gRXJBmqVWdAj7fEIUxAi33vgDHuD0h53IjbLot//kM1TDSw 3aNtGiQayft8GK9FHMgXybU+Dla88ENIaXk2ANc6iYwh7vOveCVU9pQl2Pk3PnRPGxuE pDiWjIGv7j3+jzM4BXJldURsfpcKaz6XNzN6IGUDjgmKc5+T6CtrFu25q0DTLNBZArs2 lHLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692128702; x=1692733502; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3QneMBPT8ky8lkuiPx8LP9V5ElnnO08mtoiDJKnEmD0=; b=Tj4LZbejAlW088J8eTwXRByL9DbKa0O2XrBfMmUE+5CRb4nKL4Z9OimD+tvQIZl2fX 0Xj2WN4V1/ZDAQ9WEHUqO26D+7lW45QBjuAoSFFSk1Zix2BpUvn68kfegdVev/3r9OlW l6B+Yk6NtY4oe1r6mTkVocgwpU4YPaTF6urOb6LMYpZZ9pCB38Qx7oHIWRCQYpW89kaF wwUZfIZjexvUJtXnXY0oROCCPPH5uBAdZCrrhU3tr6C6RW+X3212mD+nePgirC30vrVB G4C3Xj01enjRrxOcQer9gJNAYLTVcuQFPUPMKofplZme5wRAmAmy15yOFSwl2dEfBLtq 89UA== X-Gm-Message-State: AOJu0Yx7aBfOCVFY0HYkz3bodwmXIiBj5rSRR3nvQdWYucSP/0pF5DfX rXinbwsyuTFsnOYnuuCEji3tBInD7ecttA== X-Google-Smtp-Source: AGHT+IHoczIZ9BjjZExGDp8wO2h30hC4jWdZY/qvIqBE6JW9BCyUeeV8eDav/kqeYknEm0PoIlke9g== X-Received: by 2002:a05:622a:1981:b0:40c:3f64:b55f with SMTP id u1-20020a05622a198100b0040c3f64b55fmr17811569qtc.15.1692128702353; Tue, 15 Aug 2023 12:45:02 -0700 (PDT) Received: from localhost.localdomain (dsl-148-65.b2b2c.ca. [66.158.148.65]) by smtp.gmail.com with ESMTPSA id h11-20020ac8744b000000b00403ad6ec2e8sm3953031qtr.26.2023.08.15.12.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 12:45:01 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 15 Aug 2023 15:44:07 -0400 Message-ID: <340786ccd3d40c0c8906028dc20af5ae9b0aa6b9.1692128648.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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. --- (no changes since v1) guix/git.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: a4bed14c438dc0cbc1c1885a38f8409c7fef7957 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