From patchwork Sun Jun 11 18:54:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 50843 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 5F7CE27BBE9; Sun, 11 Jun 2023 19:55: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_INVALID, DKIM_SIGNED,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 3127F27BBE2 for ; Sun, 11 Jun 2023 19:55:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8QDR-0004KQ-Be; Sun, 11 Jun 2023 14:55:05 -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 1q8QDP-0004KD-M1 for guix-patches@gnu.org; Sun, 11 Jun 2023 14:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8QDP-00024o-Dx for guix-patches@gnu.org; Sun, 11 Jun 2023 14:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8QDO-0003q4-MY for guix-patches@gnu.org; Sun, 11 Jun 2023 14:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64009] [PATCH] guix: git: Set initial branch name for git-fetch. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jun 2023 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64009@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168650966314703 (code B ref -1); Sun, 11 Jun 2023 18:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jun 2023 18:54:23 +0000 Received: from localhost ([127.0.0.1]:37740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8QCl-0003p5-5O for submit@debbugs.gnu.org; Sun, 11 Jun 2023 14:54:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:48850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8QCi-0003ox-Q5 for submit@debbugs.gnu.org; Sun, 11 Jun 2023 14:54:21 -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 1q8QCf-0001mz-AA for guix-patches@gnu.org; Sun, 11 Jun 2023 14:54:18 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8QCd-0001vv-Dr for guix-patches@gnu.org; Sun, 11 Jun 2023 14:54:17 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f735259fa0so36340315e9.1 for ; Sun, 11 Jun 2023 11:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686509652; x=1689101652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=efrEGCEXMHXty58MKBFWKwaXs9jjlo/ZPoO9RWI5j/8=; b=GO3N60nixD0fOzlAVGbOIf4a0njs7XGAxGSrYZKaeCqymz20pdJj9C1Oycbh7EE8M1 trgzbWul8ITvDN7HAF/4Acu2BAUefXLkFYD7eK1LRQuVImUtcFzMvpk/PwzWh34rD74v Aj86CO/GGvKFhv6+Bjerq/1JveQIEnaV53qQHhbaP88WakTdgVdabD0FnizeTEFpVNXA O2oxp7sIyBe5f5qp349EYoNPaaSPaNhcTAJeqzOC92ihTG9uXtOYFuic7t0Z3oUJisOE CpDhT4tUE9hTJq8epI665igjSLCnwPm3l4fUvg4BeE7izpeVZdGgc9jrSA4RYY3jMapT SIyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686509652; x=1689101652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=efrEGCEXMHXty58MKBFWKwaXs9jjlo/ZPoO9RWI5j/8=; b=fwNh6Oac0w+UGHi7VptPUYvkmlaiHx/rVqKqw6p1uoZ8HMLhinCZWUDAVDiIO3WF62 u3viyz3tQDQF047rNq8ES6pyV+1KFjcZrEc1K/bSO7+RwdoIfBz5XXw1mU4j2H3ZZaZS 2nYaXhnB656+Ma7Ne33KwDTCCXM7wuViX5wt/7DfxaMwRb7v/dYEerbPQQSncRvPXkZr cZt+htm/mFZArEqD8P8cyny+FMYnX7PKq48UTgy1HDQVHhM3StnABmBfQBB36wsA9iR5 /VrHQ+Uy6GHQ4WP6289J83fl19hczphplXSPfeq1IMgF5vU20BjhWoF4qYheCnHL1gfH JKOA== X-Gm-Message-State: AC+VfDxt3jqVz9HsxZmk1h18BIfvcI+HqZr5Tyenf+4w838z+z8yWb/2 6U1mIZNlaMftK57ENjiAdivC2svA9Joj6Q== X-Google-Smtp-Source: ACHHUZ4lhYm5IeE7DCubnLJKOGoYHYmGco9MbcoqcNs3qPyHD9rekfUb0LeMsiTBFGmm+yznNmfLrg== X-Received: by 2002:a05:600c:a39f:b0:3f8:1b81:9e96 with SMTP id hn31-20020a05600ca39f00b003f81b819e96mr516573wmb.30.1686509651946; Sun, 11 Jun 2023 11:54:11 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id e17-20020a05600c219100b003f18b942338sm9172131wme.3.2023.06.11.11.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 11:54:11 -0700 (PDT) From: Efraim Flashner Date: Sun, 11 Jun 2023 21:54:12 +0300 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=efraim.flashner@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 This removes the 'hint' about choosing a branch name when creating a new git repository. * guix/build/git.scm (git-fetch): When running 'git init' add an initial branch name. --- guix/build/git.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 73fa2889895f35bcf0c41f1174413381fdd7ec2c diff --git a/guix/build/git.scm b/guix/build/git.scm index 669e38cd32..deda10fee8 100644 --- a/guix/build/git.scm +++ b/guix/build/git.scm @@ -52,7 +52,7 @@ (define* (git-fetch url commit directory (delete-file-recursively directory) #f)) (with-directory-excursion directory - (invoke git-command "init") + (invoke git-command "init" "--initial-branch=main") (invoke git-command "remote" "add" "origin" url) (if (zero? (system* git-command "fetch" "--depth" "1" "origin" commit)) (invoke git-command "checkout" "FETCH_HEAD")