From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 23 13:45:54 2025 Received: (at submit) by debbugs.gnu.org; 23 Mar 2025 17:45:54 +0000 Received: from localhost ([127.0.0.1]:52479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twPOU-0006Sl-44 for submit@debbugs.gnu.org; Sun, 23 Mar 2025 13:45:54 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52256) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twPFe-0005y0-Fm for submit@debbugs.gnu.org; Sun, 23 Mar 2025 13:36:47 -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 1twPFY-0005hk-U7 for bug-guix@gnu.org; Sun, 23 Mar 2025 13:36:40 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twPFX-0002mv-8h for bug-guix@gnu.org; Sun, 23 Mar 2025 13:36:40 -0400 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-225477548e1so63219115ad.0 for ; Sun, 23 Mar 2025 10:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742751397; x=1743356197; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=yJJ18rc5Eo+NTIgaNe9uYpPpzo6J8/EG3/A3Yc1XQ3g=; b=gWMbYriWXY9uAXbZ2W+zdRxL/cdk7Xpqz6Q9PmVZ5Pkh2w10Hln/qpPRVQmB7MwNOP nfhyKM4gHLZxo98mKfD9mRLSMnigDRHDhA00YQJUEecQaiuwevR8cUTPb+eg7c/jGs04 myXu95jdyY7OEIuTsiEPpb+Ib1L2nI4UxEgzxUQqzbhNy0daePkTYP7I0Dvga7B0WWaJ EoEFLAg4/k3PM4MgTwOmSyTPg0cwWePaz60hx+XdbAf+laLduWW+QaBH3Y+ZSdGz88ka G/WkSD7jBgwOkXhOxAh47rdP2MvNA95dOx3kVd9Gno7goDlR0u4NnmMTSW/IkF2uem1Y vwbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742751397; x=1743356197; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yJJ18rc5Eo+NTIgaNe9uYpPpzo6J8/EG3/A3Yc1XQ3g=; b=FKgRZpuma1LaWSDzaSS/J+1KNMdm6kjzkpajMxrqEpF3OAEHIVWODYKQ0KGjQ11SLI PKkFc3yrdmCWMJnqkGfZKnGPawDJWRJX+UmaWzjJMgcD9rxKVSsYnSjp5R9jya+4GdH5 GYu67wWhuwf5KQiR3bbV0xXk5bKdlw7xjYdvN8rGUAEtowhIb1ViQv70nJuqLXzgxyIv +d1sUKi8EdnK6Xl6jYYfhB7AqzSbz5EhfUPNYdCZmr1jy683mbgztzS2d0RE/hEodZUJ 9caCOWK3gUznQ/BbuPqwR78bCcmIw6TNkOBJG/Da1CAmfq090Ej06SXjkwrVCmOK01Ga IsOg== X-Gm-Message-State: AOJu0Yx4j5RNNkpNudg2hhOW/IVAm+aYT8ATU7y0i9LUj+Tl9mbPHywM RBF5BnlL50r2hPekm7uF75yUt+SiH/7a3UwZSAvuYTr+PEJXRpicJ6pXGijKSM86CclYEi0AE87 /y1y6dTsCwmcj2IaPGkpQX0LhKaWkkrK4rsKY0g== X-Gm-Gg: ASbGncta/G/Aa9yp9Lt0qFI6UCwKuZ+wUnCGq5yak1UhyPVyPqjOSuXpB9d8utTffZB sPySKY6JG53viTH4Zrsk0rUxKzfTvvgwAeeLIl/gJfpEz+XAC8Ij9iRwakN1XfTp4YmgZp4Npc6 Ou7WbplkImLSDSLpDiwMRzjA5BBDEIL4xhCBGcYJWwH1fC9gcuo+Abs9vWOTw= X-Google-Smtp-Source: AGHT+IEUzZnU3t0NqehVNWUOyyFjoA+Z1D2doX3wF38BXw7Id0Sqy5GdGo/8L4eLX1VDOzWgD4KPFYv+DdhFoCKfLqo= X-Received: by 2002:a17:903:98d:b0:220:e362:9b1a with SMTP id d9443c01a7336-22780d83b3emr201644825ad.25.1742751396616; Sun, 23 Mar 2025 10:36:36 -0700 (PDT) MIME-Version: 1.0 From: Jodi Jodingtonstinski Date: Sun, 23 Mar 2025 12:36:25 -0500 X-Gm-Features: AQ5f1JqO3JRr4ObX5pH2iDN32nG_FSRQzvphH_rlABBFojXJFhE15BL3Ckau1HM Message-ID: Subject: `guix pull` fails with `autocrlf=true` in git config To: bug-guix@gnu.org Content-Type: multipart/alternative; boundary="000000000000ed602b063105ede8" Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=jodijodingtondev@gmail.com; helo=mail-pl1-x643.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, HTML_FONT_LOW_CONTRAST=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 23 Mar 2025 13:45:52 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --000000000000ed602b063105ede8 Content-Type: text/plain; charset="UTF-8" Ideally `guix pull` would ignore this setting (and possibly all user git settings?) if it does not work with it. This causes errors such as: `gnu/packages/music.scm:2732:1: invalid character in escape sequence: #\return` and can be resolved by disabling autocrlf and deleting `~/.cache/guix/checkouts` (thanks Rutherther) --000000000000ed602b063105ede8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Ideally `guix pull` would ignore this setting (and possibl= y all user=C2=A0git settings?) if it does not work with it.
=C2=A0This = causes errors such as:
=C2=A0`gnu/packages/music.scm:2732:1: invalid character in escape seque= nce: #\return`
and can be resolved by disabling autocrlf an= d deleting `~/.cache/guix/checkouts` (thanks Rutherther)
<= /div> --000000000000ed602b063105ede8-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 11 13:15:19 2025 Received: (at 77214) by debbugs.gnu.org; 11 Apr 2025 17:15:19 +0000 Received: from localhost ([127.0.0.1]:51598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3HyJ-0003bK-6U for submit@debbugs.gnu.org; Fri, 11 Apr 2025 13:15:19 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:45260) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u3Hxw-0003Tm-OO for 77214@debbugs.gnu.org; Fri, 11 Apr 2025 13:14:58 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cfebc343dso17284805e9.2 for <77214@debbugs.gnu.org>; Fri, 11 Apr 2025 10:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744391690; x=1744996490; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8b6LgCfgrjRK1h8fmL480TCvX87skYwWqlF2nb+yHDg=; b=Iw3Jh/NYxL3dilvHqmF7xds4yD3A8jP+KfyLgyvHMDKzYJJGbaMz9Tkn53f1Ki8s0K 1v3WXr/4ZRHLw6sF44XDeajwDQOU7JBJ7kK3CT8wMq4fKhu/VzJm97wr0MbFJpXooOC3 mBJbEDBkLPpVW3oB7ptnZ1yvhA3wRr7J1yqtZzm9ZZZNv9K5xRdiYIpMWZ9jXTpW+6sa QrY7Qz4FnfCoZFTzlmHiU3Sn4oFGnVhoaVmQsX4U6M9fzQvuNhb6ei784XGiljZBNvvC Zwx3INKttbHmqWIcUHP4qoToDj2zldQd1R6Dd1EaQF5/E2UlUsZtPOYwMcMAffgmh03y KFXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744391690; x=1744996490; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=8b6LgCfgrjRK1h8fmL480TCvX87skYwWqlF2nb+yHDg=; b=xAxrlfA6FgKP8/qJKbjG+Z6bvbcFGG3oWKNMH5E/avA6CSW4v1ULEqXzRd4mMCq44F 6hbtQzYxW4CbZZ2xN8AhfE+dQGwG6MREwQapiDvf97Y5zlLhG2Hfwzb9Q6OMNsxgpFcS 0Hx3HptT+CZErM9EV1N2MX099yQyopLIXcPv3UOehqrNTTd7SsxZ3lAaNzjbBtJjw7GH Us9w5lhwgByoE5Yecd9uFQG7VvarRXb8njIJgVe5j6GnuASVshEtnmWti/IHZK6EqB4U OTnzYNCk10g6gz0ixY8uzLBpTVi/8JlK8+e/jWlv4HG6WwOFKF5hFya16M9iFSpn44mh U49A== X-Forwarded-Encrypted: i=1; AJvYcCUzH37v/FwGEf7wOLU8LJ3xH15OttGzbz3W6IXyc4lbwbG4r516jHoHXlZ/AHBPItpeKkuY+Q==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzKMPoTiz4tN4xaUVoHpwmSTTFOjnlF6v4y2KDTRWUZQfGEefBm 4iUwpGVC66LT7kwORWDKPipsygQU7xofBlBsyui8r1sQw1sktVwEv6PgWQ== X-Gm-Gg: ASbGncvsGB9fP+UN14HzNO2gfhfXv1Q0JGjnFfY4fUgtMr/Vm0b2ve3ObhKlnJYkqlJ CJoP2rF7ExXQJmFBbu2v+E3W1m6b26dXZa38goCgUj5i/56nAQ23GT+/q/qOHt6vUqupy+wHnhK ZfGh3YaJ5FFZZ7pjh/0bNHULP2v93YmNTMYrgJKNx51vrkSP5MUj3SD5uTBkecLb6IMDAedLVbe OiKMFYkZ4NTpHsXLc5SIkH4Iye0QUV+pKw/kGnUdRDSEQH4U5hN0JSTfFcNBoWoT1PvIGiL10zL 26GJO6Jhb7Bzp/fAaQIm90T9lGecweaLG+3P6OhDa1NCCQj0YcojAA2t6i0x/r363Nqy/g2LSQT Jl9656f5JM+xlhM6FJF52JNVAjA== X-Google-Smtp-Source: AGHT+IHc05PxjQUvcBLmxNTZ2nBiiRPqBiMTSxUTjyaophEkoq4e7MwGsaKHf3hrCvPDizEETqz0BQ== X-Received: by 2002:a05:600c:3490:b0:43d:fa58:81d3 with SMTP id 5b1f17b1804b1-43f3a9aeefbmr30796595e9.32.1744391690452; Fri, 11 Apr 2025 10:14:50 -0700 (PDT) Received: from lili (roam-nat-fw-prg-194-254-61-43.net.univ-paris-diderot.fr. [194.254.61.43]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39eaf445708sm2616912f8f.96.2025.04.11.10.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 10:14:50 -0700 (PDT) From: Simon Tournier To: Jodi Jodingtonstinski , 77214@debbugs.gnu.org Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config In-Reply-To: References: Date: Fri, 11 Apr 2025 19:14:17 +0200 Message-ID: <87mscmboye.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77214 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Sun, 23 Mar 2025 at 12:36, Jodi Jodingtonstinski wrote: > Ideally `guix pull` would ignore this setting (and possibly all user git > settings?) if it does not work with it. > This causes errors such as: > `gnu/packages/music.scm:2732:1: invalid character in escape sequence: > #\return` > and can be resolved by disabling autocrlf and deleting > `~/.cache/guix/checkouts` (thanks Rutherther) For instance, using 1d846b89ca3: --8<---------------cut here---------------start------------->8--- $ cat -n gnu/packages/music.scm | grep -C2 2732 2730 (add-after 'unpack 'patch-paths 2731 (lambda* (#:key inputs #:allow-other-keys) 2732 (substitute* "deps/juce/extras/Projucer/Source/Project= Saving/\ 2733 jucer_ProjectExport_CodeBlocks.h" 2734 (("/usr/include/freetype2") --8<---------------cut here---------------end--------------->8--- and I do not spot where the problem could come from. But indeed, --8<---------------cut here---------------start------------->8--- $ git config --global core.autocrlf true $ guix pull --commit=3D1d846b8 -p /tmp/new Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.or= g/git/guix.git'... Building from this channel: guix https://git.savannah.gnu.org/git/guix.git 1d846b8 substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... = 0.0%guix substitute: warning: bordeaux.guix.gnu.org: connection failed: Con= nection refused substitute:=20 substitute: updating substitutes from 'https://guix.bordeaux.inria.fr'... 1= 00.0% building /gnu/store/rc93f52y5l9v72l23cxzagq59mhhkc81-compute-guix-derivatio= n.drv... Computing Guix derivation for 'x86_64-linux'... \ice-9/read.scm:126:4: In p= rocedure read-string: gnu/packages/terminals.scm:601:1: invalid character in escape sequence: #\r= eturn guix pull: error: You found a bug: the program '/gnu/store/08c4v80na6c6cpd3= k159k0gfwf7ad1ap-compute-guix-derivation' failed to compute the derivation for Guix (version: "1d846b89ca3100fb1c6387= dfea3e052e9495cf55"; system: "x86_64-linux"; host version: "76e07a6f5c07f2c904ba5c1ade84feac88200ade"; pull-version: 1). Please report the COMPLETE output above by email to . --8<---------------cut here---------------end--------------->8--- And for me, the escape issue is elsewhere: --8<---------------cut here---------------start------------->8--- $ cat -n gnu/packages/terminals.scm | grep -C2 ' 601' 599 "/etc/udev/rules.d/70-pcspkr-b= eep.rules") 600 (lambda _ 601 (display (string-append "\ 602 ACTION=3D=3D\"add\", SUBSYSTEM=3D=3D\"input\", ATTRS{name}=3D=3D\"PC= Speaker\", " 603 "ENV{DEVNAME}!=3D\"\"= , " --8<---------------cut here---------------end--------------->8--- Well, interesting! :-) BTW, I agree with: > Ideally `guix pull` would ignore this setting (and possibly all u= ser git > settings?) and I=E2=80=99m even surprised that ~/.gitconfig is read by =E2=80=9Cguix p= ull=E2=80=9D. Ah?! I do not know which libgit2 procedure via guile-git reads ~/.gitconfig; somehow: openable-repository? relies on git_repository_open_ext -> obtain_config_and_set_oid_type -> git_repository_config_snapshot -> git_repository_config__weakptr and there I guess some GIT_CONFIG_FILENAME_* variables is read. Well, that=E2=80=99s annoying. I hope I=E2=80=99m missing something. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 11 15:48:03 2025 Received: (at 77214) by debbugs.gnu.org; 11 Apr 2025 19:48:04 +0000 Received: from localhost ([127.0.0.1]:51841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3KM7-0005jU-EC for submit@debbugs.gnu.org; Fri, 11 Apr 2025 15:48:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49282) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3KM4-0005iw-3G for 77214@debbugs.gnu.org; Fri, 11 Apr 2025 15:48:01 -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 1u3KLy-0002HS-Fu; Fri, 11 Apr 2025 15:47:54 -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=qdFshLfNAI0r2rqjORbqVsX852ItkApKd74wKVwKx2Y=; b=S/eZN/FphpGuVB/wi90i fUpnvTTfN4MAlcRqvInGnSGI3+RRedzV/M4QYASO/qGS7BZqRav1bMNqcODNe2INeJfeDoTw4fOEo V/EuEAu+XBpeggikdnCfqD9+mkmGidLB65Le0A4mzQDxHk5jEcyGeMAW31F2fXU0sR068g4up2HCi sNEAaFOntS7AHCvko7ngGocbF4ChOCy9bkyNzqco/lHDhpb/R8LsHUiZkz+hJLtL875CsN0ScEcmd sU6KQzKI99XZho3r5xGpNEYMTOO2grfp3la9QRf3KahMnqbkFFCstryt8G3fa3ua4SPmMPxFU40sV aDAmf3ywiulQHw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jodi Jodingtonstinski Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config In-Reply-To: (Jodi Jodingtonstinski's message of "Sun, 23 Mar 2025 12:36:25 -0500") References: User-Agent: mu4e 1.12.9; emacs 29.4 X-URL: https://people.bordeaux.inria.fr/lcourtes/ X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu X-Revolutionary-Date: Duodi 22 Germinal an 233 de la =?utf-8?Q?R=C3=A9volu?= =?utf-8?Q?tion=2C?= jour de la Romaine Date: Fri, 11 Apr 2025 21:47:51 +0200 Message-ID: <874iyuh448.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77214 Cc: 77214@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Jodi Jodingtonstinski skribis: > Ideally `guix pull` would ignore this setting (and possibly all user git > settings?) if it does not work with it. > This causes errors such as: > `gnu/packages/music.scm:2732:1: invalid character in escape sequence: > #\return` > and can be resolved by disabling autocrlf and deleting > `~/.cache/guix/checkouts` (thanks Rutherther) I agree that =E2=80=98guix pull=E2=80=99 should ignore such settings; even = if errors like the one above did not occur, you=E2=80=99d get a checkout that=E2=80= =99s different at the binary level, and so no substitutes etc. I think the patch below should do that, at least for new checkouts. It would be great if you could try it and check that it works for you. You can do that by: rm -rf ~/.cache/guix/checkouts git config --global core.autocrlf true ./pre-inst-env guix download --git \ https://git.savannah.gnu.org/git/shepherd.git =20=20 Although I=E2=80=99m not sure =E2=80=98autocrlf=E2=80=99 would fire on this= repo (why does it fire in the first place on the Git repo=E2=81=88). Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/guix/git.scm b/guix/git.scm index 4164531c0b..0a7bcea9bb 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2017, 2020 Mathieu Othacehe -;;; Copyright =C2=A9 2018-2024 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2018-2025 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2021 Kyle Meyer ;;; Copyright =C2=A9 2021 Marius Bakke ;;; Copyright =C2=A9 2022 Maxime Devos @@ -236,10 +236,17 @@ (define* (clone* url directory #:key (verify-certific= ate? #t)) (lambda () (mkdir-p directory) =20 - (clone url directory - (make-clone-options - #:fetch-options (make-default-fetch-options - #:verify-certificate? verify-certificate?))= )) + (let* ((repository + (clone url directory + (make-clone-options + #:fetch-options (make-default-fetch-options + #:verify-certificate? + verify-certificate?)))) + (config (repository-config repository))) + ;; Prevent modification of the raw data. + (set-config-string config "core.autocrlf" "input") + + repository)) (lambda _ (false-if-exception (rmdir directory))))) =20 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 13 11:17:39 2025 Received: (at 77214) by debbugs.gnu.org; 13 Apr 2025 15:17:39 +0000 Received: from localhost ([127.0.0.1]:43417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3z5X-0001oF-7B for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:17:39 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:61485) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u3z5R-0001nf-PY for 77214@debbugs.gnu.org; Sun, 13 Apr 2025 11:17:34 -0400 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-22580c9ee0aso35671725ad.2 for <77214@debbugs.gnu.org>; Sun, 13 Apr 2025 08:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744557448; x=1745162248; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Bay2o69ZS2HXTbKIVDZ2GpJumq8rD1/6duOkdVPfHHo=; b=d3/gwPk1gd1Ad9T1w6w2KcyWuQq1+SQMGvsshFGeh5N0eJUMTbb47yNkZwaGhBpBK1 Fq9XSk0p49w8rO3I92LNbnsi0jDjrNg2WbiXGYrS1xjw2fIMiyheGxyh3gUpEJdwWvZV J6X72LXTDuj+7v59cXVhDZKG7EfVkXqr6xSIhdGCO0ULGWthJY8ld8gB5mMmgaH4T4HD +x6nWefubtfIYamYTZBFa8ATON0ly48i6aqQvhGA+YbIY94crHNPot5Hn+gEK3gWQqYe WzCtwn35sMn/LwKNl4vUBUqocZCv7U+VJz57MtiU2J+TH9kAi0UTRzr2uSnu6WILtaaZ cCuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744557448; x=1745162248; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Bay2o69ZS2HXTbKIVDZ2GpJumq8rD1/6duOkdVPfHHo=; b=PipolZI/KH1OO8GlORsih/pubhOzI4wLX1si62GABpHmsVOarLmbBWqW5CO9lleB9/ WRs0vXXhvRtuA3VPb4LSQOMruE3gGstOfulq9l05GVOOSry2oSYSLGU+prqvGWzi7myG 0d/zitu+XJiGThb27aILt0ZMqDbFAJcyqZr/BI1Z1thYWiyn48JZCTDbu6Wf42y5NLaK A2Gr4SYuFxFaHs+h6TYD7r3c9cHwknKV+9oOJ44AZdqapaugnxy3JaNUUYpwdhb2j/Dq NHQpj2TD9AWHB19RNl8Wt2rsb1H8CRfIUNl50oYgXQMhJF/cYYxPu7/Z0f2ClwdvOQEM MAMQ== X-Gm-Message-State: AOJu0YyJBcjjuyESp5PSuqwV8Z2r47nikbc6b0QarbIPmoYARXW1WWGf cuuV02abYfzWmvHrh9vRrf6qPrvPDSgP6D1K4rwx59w2ZTqnhMgkJADq2Gttl7EcZx2XKGAn7sM RfeXnVd8yHcBwGjsH4Ex99TKOm3I= X-Gm-Gg: ASbGncvSajFP1fY1VfIauRxDi7PBbmARhnbtfNCq0CqC7XyaheuVvGtgAPShgVxQYkm feFylBgxvLWlh95lxGkomcAcUwC1oqrCmb4Ndwbm2RyaElz8zGYBLB63QJL4ELoqnR37+pE3PZf NbE01dgQjYQkwHH5/jdWGxd8MkGKFr/MT0MvU18DTHE7QhXYl71fdb6oU= X-Google-Smtp-Source: AGHT+IEpsipolcy1QHeXe7ANHhkFLS6VQmaGXeP+93I7e8+TCHQEAeiZD9PFYDbOBf8KuCgJ/C833vnDTwDLU4/g0KM= X-Received: by 2002:a17:903:1a08:b0:224:1294:1d26 with SMTP id d9443c01a7336-22bea4b6dd7mr118830915ad.13.1744557447420; Sun, 13 Apr 2025 08:17:27 -0700 (PDT) MIME-Version: 1.0 References: <874iyuh448.fsf@gnu.org> In-Reply-To: <874iyuh448.fsf@gnu.org> From: Jodi Jodingtonstinski Date: Sun, 13 Apr 2025 10:17:16 -0500 X-Gm-Features: ATxdqUEbSkdAtKBW70yJhEvdzhCODWM0zjJgG6UCRWlVUIeZ2Y4MAunokG9yP5g Message-ID: Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: multipart/alternative; boundary="000000000000f1a4670632aa6e15" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77214 Cc: 77214@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000f1a4670632aa6e15 Content-Type: text/plain; charset="UTF-8" > > It would be great if you could try it and check that it works for you. > You can do that by: > > rm -rf ~/.cache/guix/checkouts > git config --global core.autocrlf true > ./pre-inst-env guix download --git \ > https://git.savannah.gnu.org/git/shepherd.git I did this and it worked! I also checked if the downloaded files had any carriage return characters and they did not, so AFAICT that guarantees autocrlf was ignored. thank you for this patch, I wasn't able to figure it out myself. (I had to temporarily use my web-mail client which does not reply-all by default so I'm re-sending this message with reply-all, my bad) --000000000000f1a4670632aa6e15 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
It would be great if you could try it and check that it wo= rks for you.
You can do that by:

=C2=A0 rm -rf ~/.cache/guix/chec= kouts
=C2=A0 git config --global core.autocrlf true
=C2=A0 ./pre-inst= -env guix download --git \
=C2=A0 =C2=A0 =C2=A0https= ://git.savannah.gnu.org/git/shepherd.git
I did = this and it worked!
I also checked if the downloaded files had any carri= age return characters and they did not, so AFAICT that guarantees=C2=A0auto= crlf was ignored.
thank you for this patch, I wasn't able to = figure it out myself.

(I had to temporarily use my= web-mail client which does not reply-all by default so I'm re-sending = this message with reply-all, my bad)
--000000000000f1a4670632aa6e15-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 14 17:09:58 2025 Received: (at 77214-done) by debbugs.gnu.org; 14 Apr 2025 21:09:59 +0000 Received: from localhost ([127.0.0.1]:49295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u4R42-000229-Hp for submit@debbugs.gnu.org; Mon, 14 Apr 2025 17:09:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49138) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u4R3y-00021r-Lj for 77214-done@debbugs.gnu.org; Mon, 14 Apr 2025 17:09:56 -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 1u4R3t-0005x0-69; Mon, 14 Apr 2025 17:09:49 -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=RHdNq3tVWNfZjazZLM2+z1cPrmKPYldqpReTfq5DRVQ=; b=V7s/HCxEqXapk+LfgI81 PfRZ8kMgERJDnWRmbowLIrEfP2WJ8jd5Rbi/8V429ztaM2W9p+uRTsHvI4qTXwqIYrCv5TxlCbeQT fZpmiBhmsUmMEw6iggXB2VX4mNLAjiAPDOUhU4xyRX3RGz3IbmosHQgLvu6VI9nfgex2g46IkJHf3 0KNY1B1LhdCYbL128BzyvBffNnyx+DuF3Ngpk0KDPLAIfpKs/JnfXL/QfnwL4b2NJLlNnC0ZdQzd9 XolEwpDLbx1kU2447qoJVzcqrqoXhiIvBJjOnvYRCKnn6QzpVohBvRY5yEZWB9ohNsFapKEa/BKpv QpbNXtmN6kpYpw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jodi Jodingtonstinski Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config In-Reply-To: (Jodi Jodingtonstinski's message of "Sun, 13 Apr 2025 10:17:16 -0500") References: <874iyuh448.fsf@gnu.org> User-Agent: mu4e 1.12.9; emacs 29.4 X-URL: https://people.bordeaux.inria.fr/lcourtes/ X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu X-Revolutionary-Date: Quintidi 25 Germinal an 233 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour du Pigeon Date: Mon, 14 Apr 2025 23:09:43 +0200 Message-ID: <87mscilaaw.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77214-done Cc: 77214-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Jodi, Jodi Jodingtonstinski writes: > It would be great if you could try it and check that it works for you. > You can do that by: > > rm -rf ~/.cache/guix/checkouts > git config --global core.autocrlf true > ./pre-inst-env guix download --git \ > https://git.savannah.gnu.org/git/shepherd.git > > I did this and it worked! > I also checked if the downloaded files had any carriage return characters= and they did not, so AFAICT that guarantees autocrlf was > ignored. > thank you for this patch, I wasn't able to figure it out myself. Pushed as b5e567bb2b277f89af493ba8cd0799fdb368a184. Thanks for testing! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 15 12:16:05 2025 Received: (at 77214-done) by debbugs.gnu.org; 15 Apr 2025 16:16:05 +0000 Received: from localhost ([127.0.0.1]:54222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u4ix8-00032F-LV for submit@debbugs.gnu.org; Tue, 15 Apr 2025 12:16:05 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:51223) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u4ix6-000317-1k for 77214-done@debbugs.gnu.org; Tue, 15 Apr 2025 12:16:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43d0618746bso45354615e9.2 for <77214-done@debbugs.gnu.org>; Tue, 15 Apr 2025 09:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744733754; x=1745338554; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=uyltiX6qpj4CmJpU9OdH1nuqFJLAUXFRImCRs/Ta1I8=; b=NV9oRozCXEqvt4UI/8gu9W6DY93mAOF/CbcUuH5+sNj3nTdjcAOo8g0ayuz7Qe+h2D pPtR2DgkDHo7+4wo+JzhmJZ1QB3rDfDT+t+OSu0UTdq2jQI2j8yt42eJPTSwpCYQJYi+ +Eed1xpJ3MyQWfqxVSPEd2hdNNv/tWk6yE4cMGdrswHEHWrmQdqHMWHbCflpifw1Baot 5r6QIeRiKFSNeMgDDfj/6EdLBQ4aizVnlAlDziVEorKZDmvH8ZqSMtguM1WWu3R2raFG 39M5p74OubfWGAxOSzNv/IZ36IpugzCQz5DuFuo/4lyfQxABk4sAUhZvZpBeuJkPthQK Cuig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744733754; x=1745338554; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uyltiX6qpj4CmJpU9OdH1nuqFJLAUXFRImCRs/Ta1I8=; b=Ah90j/cWty1/T9IS9ASUiWx/CJY7Rq1oydS4G/TES4a8Hw2GV6ksi4UyOMF6mNGTjv sVFDuc4dg0RhfLXQ2PJHQ7md8Fgh3mnnxOfis1OMU56eIX5ULwZww520zBMMp4bqvJzR 5IqvwYZiN6j9BdZ/3piIhGUxqhCgLpamWmUC5rrWDB/dNmj9Omupvoy9F/haYinzDbZq 1KngQuobEA0uitqv/QEz/kyd/kNk1epEvaIM1AUCcfrfTv4zMamYNdHYN6ACS+Po3fL/ 4cNqwPIY9l/g9IlT/WDNZ13J4xqM0ixhlJe8zI96Zem4WckpG/JYPdccWgfgaI6eMERJ togw== X-Gm-Message-State: AOJu0YyC59EIqbzndx32ch62ffS0BfBcWrMdUqlHk1YaeA2fOlIKeKvl R15EWPxGn/aqqaQZaAv6FTEoRve4Sx4Aptn6RfKdi+wuf/gc8htG+0qmYA== X-Gm-Gg: ASbGncvVBJT0CPm/G6BofXZ5R/3AJHTI9OpuqZvAs2kLPuf4xVSYdzj5FPDvTOw3rV8 YiOVthL6ru7f/pwnXsIoLGak3HxhhsZrzYY3i1TOOfCwiuTBPGSPZ8OvU9dbp8WWZ/NBwkIV+rR Tr2/esuFoCdMiPC2tOwEakC8pIa2ToCORtSa8kRK1sironT/J3BGoafGY2mIRBz1SjykvNvN80T Bvuk3FHBop6ZcjPyL0a2FlrJCMHF1H50pfgIZWfcdE42nyoIUvDAQvhTfjOkaXMN67bUBGca9MC l82E44qdMpdioCllXn1DrXztMP9xNNiUPGA+JKlp X-Google-Smtp-Source: AGHT+IHfzwC2WFplNrPyy68vSdxaLA6Zket7wD/tNZ3kAygwuHtcRwDl2HlcVJBu+iMJzVgUXUMv/Q== X-Received: by 2002:a05:600c:3113:b0:43d:fa5d:9315 with SMTP id 5b1f17b1804b1-43f3a9b159emr131922755e9.33.1744733753437; Tue, 15 Apr 2025 09:15:53 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f206264a1sm219940815e9.9.2025.04.15.09.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 09:15:52 -0700 (PDT) From: Simon Tournier To: Ludovic =?utf-8?Q?Court=C3=A8s?= , Jodi Jodingtonstinski Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config In-Reply-To: <87mscilaaw.fsf@gnu.org> References: <874iyuh448.fsf@gnu.org> <87mscilaaw.fsf@gnu.org> Date: Tue, 15 Apr 2025 18:15:48 +0200 Message-ID: <877c3lieob.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77214-done Cc: 77214-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, On Mon, 14 Apr 2025 at 23:09, Ludovic Court=C3=A8s wrote: >> rm -rf ~/.cache/guix/checkouts >> git config --global core.autocrlf true >> ./pre-inst-env guix download --git \ >> https://git.savannah.gnu.org/git/shepherd.git This test does not catch the scenario leading to buggy behaviour, IMHO. > Pushed as b5e567bb2b277f89af493ba8cd0799fdb368a184. Thanks for testing! This fixes appears to me incorrect. Because it only fixes on a fresh clone, when the typical scenario appears to me: 1. I run Guix since months or years, no problem. \o/ 2. I work on a project with some collaborators running Windows. 3. I add a global Git config. 4. I run =E2=80=9Cguix pull=E2=80=9C. Bang! Example: --8<---------------cut here---------------start------------->8--- $ /tmp/new/bin/guix describe Generation 1 Apr 15 2025 15:30:39 (current) guix b5e567b repository URL: https://git.savannah.gnu.org/git/guix.git commit: b5e567bb2b277f89af493ba8cd0799fdb368a184 $ git config --global core.autocrlf true $ /tmp/new/bin/guix pull -q -p /tmp/last Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.or= g/git/guix.git'... Authenticating channel 'guix', commits 9edb3f6 to ec5ea23 (29 new commits).= .. Building from this channel: guix https://git.savannah.gnu.org/git/guix.git ec5ea23 substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 10= 0.0% substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 10= 0.0% substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 10= 0.0% building /gnu/store/sggwz0vn6pldxnqfzgqaw4fx1rjkjwkj-config.scm.drv... building /gnu/store/ybvdb767hk7ccilgmb3z4yl85xgw20sc-git.scm.drv... building /gnu/store/fp8pld5b1b6sgbi9k1gwwrypynyi2n8g-hash.scm.drv... applying 2 grafts for libffi-3.4.4 ... applying 2 grafts for libgc-8.2.4 ... applying 2 grafts for libunistring-1.1 ... applying 2 grafts for pkg-config-0.29.2 ... applying 7 grafts for guile-3.0.9 ... building /gnu/store/c31lw8lmf2ncsbkpcqxwzzq01j1wb4ih-module-import.drv... building /gnu/store/wdp91p4y3kcvjfrpq9das1na95qjlgnf-module-import.drv... building /gnu/store/kvwl0ay9bb10fcibn96asnr73l4g2z4k-module-import-compiled= .drv... building /gnu/store/ify060g05i9rgxn15393yphnck775zb3-module-import-compiled= .drv... building /gnu/store/w89wb1k6139xj9k7ds4jqvzqx1qqc1b9-compute-guix-derivatio= n.drv... Computing Guix derivation for 'x86_64-linux'... /ice-9/read.scm:126:4: In p= rocedure read-string: gnu/packages/firmware.scm:1678:1: invalid character in escape sequence: #\r= eturn guix pull: error: You found a bug: the program '/gnu/store/hqzmzshc0q3rbhcn= 2wpkm9xlf8sc6s8m-compute-guix-derivation' failed to compute the derivation for Guix (version: "ec5ea239e9887f6ccf8aef= 0c9f9a6de9f72f7366"; system: "x86_64-linux"; host version: "b5e567bb2b277f89af493ba8cd0799fdb368a184"; pull-version: 1). Please report the COMPLETE output above by email to . --8<---------------cut here---------------end--------------->8--- Well, I have not found a way to tell to libgit2 to ignore *any* configuration file [1]. Therefore, your fix seems the easiest. However, the fix should be inside =E2=80=99update-cached-checkout=E2=80=99.= It should not be inside =E2=80=99clone*=E2=80=99 because a) it does not fix potential= annoyances when people already cloned the repository =E2=80=93 see above =E2=80=93 and= b) the issue isn=E2=80=99t from the generic cloning but from cache management. See the attached patch. WDYT? Cheers, simon --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-git-Move-core.autocrlf-settings.patch Content-Transfer-Encoding: quoted-printable Content-Description: p.patch >From 2f2b1af5f2c87671be06660bb8d8b6d2c9c3f6dd Mon Sep 17 00:00:00 2001 Message-ID: <2f2b1af5f2c87671be06660bb8d8b6d2c9c3f6dd.1744733253.git.zimon.= toutoune@gmail.com> From: Simon Tournier Date: Tue, 15 Apr 2025 17:57:00 +0200 Subject: [PATCH] =3D?UTF-8?q?git:=3D20Move=3D20=3DE2=3D80=3D98core.autocrlf= =3DE2=3D80=3D99?=3D =3D?UTF-8?q?=3D20settings.?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Follow up of b5e567bb2b277f89af493ba8cd0799fdb368a184. * guix/git.scm (clone*): Move =E2=80=98core.autocrlf=E2=80=99 settings from= here... (update-cached-checkout): ...to here. Change-Id: I0f91d348376f9953cfbc497148596b738705818b --- guix/git.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 01e09185885..3965c61ba0b 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -241,12 +241,7 @@ (define* (clone* url directory #:key (verify-certifica= te? #t)) (make-clone-options #:fetch-options (make-default-fetch-options #:verify-certificate? - verify-certificate?)))) - (config (repository-config repository))) - ;; Override 'core.autocrlf' as set in ~/.gitconfig to ensure files= are - ;; left unchanged when cloning and pulling. - (set-config-string config "core.autocrlf" "input") - + verify-certificate?))))) repository)) (lambda _ (false-if-exception (rmdir directory))))) @@ -606,7 +601,12 @@ (define* (update-cached-checkout url (repository-open cache-directory) (clone/swh-fallback url ref cache-directory #:verify-certificate? - verify-certificate?)))) + verify-certificate?))) + (config (repository-config repository))) + ;; Override 'core.autocrlf' as set in ~/.gitconfig to ensure files are + ;; left unchanged when cloning and pulling. + (set-config-string config "core.autocrlf" "input") + ;; Only fetch remote if it has not been cloned just before. (when (and cache-exists? (not (reference-available? repository ref))) base-commit: ec5ea239e9887f6ccf8aef0c9f9a6de9f72f7366 --=20 2.46.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable - - - 1: bug#77214: `guix pull` fails with `autocrlf=3Dtrue` in git config Simon Tournier Fri, 11 Apr 2025 19:14:17 +0200 id:87mscmboye.fsf@gmail.com https://issues.guix.gnu.org/77214 https://issues.guix.gnu.org/msgid/87mscmboye.fsf@gmail.com https://yhetil.org/guix/87mscmboye.fsf@gmail.com PS: From my understanding, this change does not deserve Copyright. I know your optimistic idea: maybe you will change again and then maybe again this file, so then the Copyright applies. :-) I still think we should keep the =E2=80=9Crule=E2=80=9D of non-trivial change w= hich means more or less 5+ lines modified. For what my opinion is worth here. :-) --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 15 13:02:10 2025 Received: (at 77214-done) by debbugs.gnu.org; 15 Apr 2025 17:02:10 +0000 Received: from localhost ([127.0.0.1]:54653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u4jfl-0001aI-AG for submit@debbugs.gnu.org; Tue, 15 Apr 2025 13:02:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39056) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u4jfi-0001Yn-OG for 77214-done@debbugs.gnu.org; Tue, 15 Apr 2025 13:02:07 -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 1u4jfa-0003rx-Ay; Tue, 15 Apr 2025 13:01:58 -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=wZHIXEAeiiNqc1ZPZn5G7LqH0KRK23x1IuLKWuBfe3M=; b=mev9DZo2C/r3iaruNNQr rk5styN74qHizELyPp8acbqsLlYQOAF2IcuU79G+qCBXgFZMCf79INKJGZdVL2+2cFr5A6o+Ph/Bc vM3CJUtDBeeXN1O42IMyT3yNfy3xvgFlQwysZpxSj91drKK85pnYNA3YsyCe+JP0bk/ZckmMJd39C in1aPBeL6/3u7jdnejoID5QPlTIoQsRdQ4NfvYsUYqhFFikiwWZBCvdsuhoz4lHeRzaO0gPefhSF5 ClInMYR5dGwde2WVZvQ55xZedpzbkI6dH4GbYukYjoAfTSF4JKhK6EPel8hPLiWdZnN7G7VYMBUOd aBv+aKb0vFFkfQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Tournier Subject: Re: bug#77214: `guix pull` fails with `autocrlf=true` in git config In-Reply-To: <877c3lieob.fsf@gmail.com> (Simon Tournier's message of "Tue, 15 Apr 2025 18:15:48 +0200") References: <874iyuh448.fsf@gnu.org> <87mscilaaw.fsf@gnu.org> <877c3lieob.fsf@gmail.com> User-Agent: mu4e 1.12.9; emacs 29.4 X-URL: https://people.bordeaux.inria.fr/lcourtes/ X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu X-Revolutionary-Date: Sextidi 26 Germinal an 233 de la =?utf-8?Q?R=C3=A9vo?= =?utf-8?Q?lution=2C?= jour du Lilas Date: Tue, 15 Apr 2025 18:39:06 +0200 Message-ID: <87sem9crbp.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77214-done Cc: Jodi Jodingtonstinski , 77214-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Tournier writes: > This fixes appears to me incorrect. Because it only fixes on a fresh > clone, Yes, but it=E2=80=99s a cache. > From 2f2b1af5f2c87671be06660bb8d8b6d2c9c3f6dd Mon Sep 17 00:00:00 2001 > Message-ID: <2f2b1af5f2c87671be06660bb8d8b6d2c9c3f6dd.1744733253.git.zimo= n.toutoune@gmail.com> > From: Simon Tournier > Date: Tue, 15 Apr 2025 17:57:00 +0200 > Subject: [PATCH] =3D?UTF-8?q?git:=3D20Move=3D20=3DE2=3D80=3D98core.autocr= lf=3DE2=3D80=3D99?=3D > =3D?UTF-8?q?=3D20settings.?=3D > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > Follow up of b5e567bb2b277f89af493ba8cd0799fdb368a184. > > * guix/git.scm (clone*): Move =E2=80=98core.autocrlf=E2=80=99 settings fr= om here... > (update-cached-checkout): ...to here. > > Change-Id: I0f91d348376f9953cfbc497148596b738705818b I was wondering whether =E2=80=98update-cached-checkout=E2=80=99 is too lat= e for this, but I think it should work: it=E2=80=99s right before the actual checkout. Feel free to push. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 11:39:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 14 May 2025 11:24:46 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator