From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6Fh3EAbv1l+oQgAA0tVLHw (envelope-from ) for ; Mon, 14 Dec 2020 04:50:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eMklDAbv1l99XQAAbx9fmQ (envelope-from ) for ; Mon, 14 Dec 2020 04:50:14 +0000 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 95CCD9404D5 for ; Mon, 14 Dec 2020 04:50:13 +0000 (UTC) Received: from localhost ([::1]:35902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kofoJ-0004Bm-OI for larch@yhetil.org; Sun, 13 Dec 2020 23:50:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofoA-0004Bc-MR for bug-guix@gnu.org; Sun, 13 Dec 2020 23:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39268) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kofoA-0003wF-Fi for bug-guix@gnu.org; Sun, 13 Dec 2020 23:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kofoA-0005FL-CJ for bug-guix@gnu.org; Sun, 13 Dec 2020 23:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45187: git download defaults to origin/master Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 14 Dec 2020 04:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45187 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Marius Bakke Received: via spool by 45187-submit@debbugs.gnu.org id=B45187.160792138920143 (code B ref 45187); Mon, 14 Dec 2020 04:50:02 +0000 Received: (at 45187) by debbugs.gnu.org; 14 Dec 2020 04:49:49 +0000 Received: from localhost ([127.0.0.1]:50814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kofnx-0005Ep-Fd for submit@debbugs.gnu.org; Sun, 13 Dec 2020 23:49:49 -0500 Received: from out0.migadu.com ([94.23.1.103]:43052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kofnu-0005Ef-EN for 45187@debbugs.gnu.org; Sun, 13 Dec 2020 23:49:47 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1607921384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cbarIz7CXRCCIR273YQDlCXvSgJaJJ4KTuyIomnSfB4=; b=fKKPqW6ryTRm876QXsEZxxun8nJZ80a7tRGSAvobypT9N4gOHuZlDJClDTANLxWw0WhSKX 8YA1Xif5C7V3XmSVEGX0qAq+9osmWlqFBkroxVdiPhEKe5PiUicSvYc6v2smhJcFWMjB7u II+NVIbMcA763HmlKsgv7Pp5zCfYgfics3I721lBrGlv2AIZUv7DcDdQnTxjGNQhyfmgZj FZ+98YCwQCEbrDZGcS/k2fYKYBXP/mw1wRboQyT8TiCVYHjvB7iBnuzlId0+6qTMIA0xO1 5YhsLqlvaTNOc0jJncEOQnf4A18x4JMt26Dq7s9MPL2cEvn5VqiByD5rJskqfQ== From: Kyle Meyer In-Reply-To: <87lfe19xw1.fsf@gnu.org> References: <878sa4vyxb.fsf@elephly.net> <87v9d8dk0r.fsf@kyleam.com> <87lfe19xw1.fsf@gnu.org> Message-ID: <87lfe1t2jd.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Auth-User: kyle@kyleam.com Date: Mon, 14 Dec 2020 04:49:44 GMT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 45187@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=kyleam.com header.s=key1 header.b=fKKPqW6r; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 95CCD9404D5 X-Spam-Score: -1.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: caWqmztbCzj3 Marius Bakke writes: > Kyle Meyer skriver: > >> One option may be to use the remote HEAD symref. [...] >> Here's a quick and dirty demo that makes your reproducer work. A real >> patch in this direction would of course look very different. > > Another quick and dirty patch to make this specific example work ... Thanks. > diff --git a/guix/git.scm b/guix/git.scm [...] > (define* (update-cached-checkout url > #:key > - (ref '(branch . "master")) > + (ref '(branch . "HEAD")) > recursive? > (check-out? #t) > starting-commit > @@ -349,7 +313,9 @@ it unchanged." > (('branch . branch) > `(branch . ,(if (string-prefix? "origin/" branch) > branch > - (string-append "origin/" branch)))) > + (if (string=? "HEAD" branch) > + branch > + (string-append "origin/" branch))))) > (_ ref))) I think using HEAD, rather than refs/remotes/origin/HEAD, will be problematic when the repository is already present in the cache. If I'm reading guix/git.scm correctly, a fetch is done in that case. refs/remotes/origin/HEAD will track any updates on the remote ref that it points to, while HEAD will stay on the same commit that it landed on at clone time.