From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id OOebCBXzv16VPwAA0tVLHw (envelope-from ) for ; Sat, 16 May 2020 14:05:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cKV3BBXzv17USAAA1q6Kng (envelope-from ) for ; Sat, 16 May 2020 14:05:09 +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 98911940369 for ; Sat, 16 May 2020 14:05:07 +0000 (UTC) Received: from localhost ([::1]:32834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZxR4-0005f2-Jz for larch@yhetil.org; Sat, 16 May 2020 10:05:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZxR0-0005dY-Mx for guix-patches@gnu.org; Sat, 16 May 2020 10:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZxR0-0006eO-DH for guix-patches@gnu.org; Sat, 16 May 2020 10:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZxR0-0005zl-8X for guix-patches@gnu.org; Sat, 16 May 2020 10:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41259] .gitignore ? Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 May 2020 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vincent Legoll Cc: 41259@debbugs.gnu.org Received: via spool by 41259-submit@debbugs.gnu.org id=B41259.158963785422984 (code B ref 41259); Sat, 16 May 2020 14:05:02 +0000 Received: (at 41259) by debbugs.gnu.org; 16 May 2020 14:04:14 +0000 Received: from localhost ([127.0.0.1]:41432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZxQE-0005ye-Jn for submit@debbugs.gnu.org; Sat, 16 May 2020 10:04:14 -0400 Received: from tobias.gr ([80.241.217.52]:41370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZxQC-0005yW-TR for 41259@debbugs.gnu.org; Sat, 16 May 2020 10:04:13 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id ffc66856; Sat, 16 May 2020 14:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=9Wzxfeb7G2pSA1bgWjVMY1 HJMDcqkzfANFtcOkVCNuk=; b=RfC78cLK6poJyEax34nMECOH1oWT2Sy7xetw1w Vgvvp6WDA+HQ/fFn6Isf31xKjXL9eHdp9Kdu+zefVMbILW0yedpJibaoA2qbvQXs +ArjboUb3x1HRie9/RsUATPfCmpMU3HfGYhNPSbRDfNbiXkORuVExG8pmf/H6nG0 P+C9k0l98oqclOVb72Vh338rdoObhZOrOsOlya5r7Nv5yXXqLA+rOcFnr6sMTDiL K5GPb26g0c/ojXWhI5fV9ztf1vfzxUYGsP/p4WhXnn7HhNX4JTEZ3A2/Jngwe1w2 qVPQMlOUl11dTgDhVF2xycpIQhw3KJkSTluNPWDNIG1yRThA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a6fb0817 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sat, 16 May 2020 14:04:09 +0000 (UTC) References: <20200514134846.29037-1-me@tobias.gr> <87blmpjg3x.fsf@nckx> <741a8f8e-e3a0-fe88-2484-3a54db19b617@gmail.com> In-reply-to: <741a8f8e-e3a0-fe88-2484-3a54db19b617@gmail.com> Date: Sat, 16 May 2020 16:04:05 +0200 Message-ID: <87o8qonfhm.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tobias.gr header.s=2018 header.b=RfC78cLK; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.61 X-TUID: JtI8GU8V43xQ --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Vincent, Vincent Legoll =E5=86=99=E9=81=93=EF=BC=9A > yesterday's today is in fact today's today... I've tried to stop that but to no avail. > I was too pessimistic, I'm not getting any merge conflict. Happy to hear it. Git can be remarkably clever with 3-way merges=20 sometimes (and disappointingly dense at others). > Your patch seems to be working nicely, I tested on a range > of VMs: > > x86_64: alpine devuan fedora debian_stretch debian_buster > i686: void Thank you for being so thorough. You've given me the confidence=20 to push this to master as=20 1a1faa78b0498fbb71f1533beb4b65817c1d3f2a. Guess I'll leave this=20 bug open since it only solves it for systemd. > I'll try to come with something for the other init systems > and add that to my series... I hope we can avoid touching users' fstab but don't know enough=20 about these other systems to say. Thanks! T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXr/y1gAKCRANsP+IT1Vt edztAQDjqOXbfjA2e7z2ByyCv6xVAJuuMEkXJ4MQhYWJDt78CAD9F0TDi3t8ZEPy mfjYREOBGicJPISoF1UJzuu5mJimOgY= =Y6U5 -----END PGP SIGNATURE----- --=-=-=--