From nobody Fri Feb 11 09:38:16 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 59E8619B7FD0; Fri, 11 Feb 2022 09:38:20 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jw7pN22zrz4pVF; Fri, 11 Feb 2022 09:38:20 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644572300; 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=qutgdVcGJ+MkoTbL3t/IbG1DeNwLPRUkoTjHVqjcCiA=; b=CLqekDYtpxoWGuA3gMUQUdCvgLZXL+4pfdpT9ihvuXZIRMba22iZGteRoHLBJyq7n/DObs /6T8gRnReE+PEgwPG/6V0sxE8qgh1cJmiZn76dEhXjQ5wHkvAVWS8RidVnthlXKOgOR5cX 7WMZqkaMI90H2xYIp3bH8BqITInsMQry11lsVPIHFn6Hu4581ZHory64Te2iM4swEK64if /hKfQWFdNFmykwW3Up7Je/y2Wp4qv9T/Zj2u+7J/4f4/rF8jeHgug0bOV6zdgjJl9uerMz FNZQ/Mr8cEKfq7bbrR+HmG9rSRQOuyzPUVYXO8qgQCmAgNEQILhKcHmfm+DOnw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id E34CBA503; Fri, 11 Feb 2022 09:38:19 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 453C627C80; Fri, 11 Feb 2022 10:38:17 +0100 (CET) From: Kristof Provost To: Andrew Gallatin Cc: "Alexander V. Chernikov" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, gallatin@netflix.com, Conrad Meyer , Andriy Gapon Subject: Re: git: b1f7154cb125 - main - gitignore: ignore vim swap files & .rej/.orig Date: Fri, 11 Feb 2022 10:38:16 +0100 X-Mailer: MailMate (1.14r5852) Message-ID: <4FC1EDC4-9F20-4271-B468-715A1727AC8A@FreeBSD.org> In-Reply-To: <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> References: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org> <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_E4A34644-1547-4932-84FE-3FB51D1FD281_=" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644572300; 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=qutgdVcGJ+MkoTbL3t/IbG1DeNwLPRUkoTjHVqjcCiA=; b=sOrC/+ApU5IArttQDMZgKKCAs4reRTkzhth3jXNTi7Sf7cCVFnGUHio2SjJyQsA/BD9fKc Z+n5e3XzK2aDjDWVO+5ZylXCKseZ9Z5QlxsEOy26eh5hEtpCxZYZjpU4TrY69Bxp1zYdWR vxSsKUtVW8BYotQperBqZTp8/byRk+n3FZAWysfy5jWk9d8bn3DxoeUXak0qEi7IVzDhoL IqyvipZTYl/KJddqPD5VRen5LZkQlWt5WrG5qVozs/K4YJuYBn4haRmyvZMuSJlS1kfCUf zGaYrpm7BW4EusrZXH7W0VT4yvBBpB7nD+CSgqspAQ2Q6QLXYr/2k3SjjrUMVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644572300; a=rsa-sha256; cv=none; b=QZReGlMOC2sQyHDyA6uIXP+T5v0yn4PurCAN0u6Eih6dkGOQN82wuO7TKoI7p/nhm6PTx7 mT8grr05NHl6gI8BDxPUjDIMaF8IdaPdBHp+iqmJy0QC8d7l7gAwO/jpejM1lQCG+MWEXp nfn4Xrz15rDPaMVxzKgq7O2zERLzAeY2f+RBnKf6P1YcuUkZ9Q7VhnEJmwjWV/2yHJGC/d aooN5fuM7BKFLcaitQT77hH3oy2qtaP6A7cV2OaCWDgLZXmwpJsV44IhSSic4uYd7Z5vll xRzoB3/fVZpFYYklTWXRbELNezk7v3rs6yT3PL+UiXHaz88haxHfVTxiqAGlNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --=_MailMate_E4A34644-1547-4932-84FE-3FB51D1FD281_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 11 Feb 2022, at 2:25, Andrew Gallatin wrote: > On 1/17/22 04:35, Alexander V. Chernikov wrote: >> The branch main has been updated by melifaro: >> >> URL: = >> https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=3D= b1f7154cb12517162a51d19ae19ec3f2dee88e11__;!!OToaGQ!4Lozvj8S2Opxre6qHuywX= _aNhwm1heXl1CyQyb0N5f_fiBJEkTQGhLzE7KlqqP9C7A$ >> >> commit b1f7154cb12517162a51d19ae19ec3f2dee88e11 >> Author: Alexander V. Chernikov >> AuthorDate: 2022-01-08 16:14:47 +0000 >> Commit: Alexander V. Chernikov >> CommitDate: 2022-01-17 09:35:15 +0000 >> >> gitignore: ignore vim swap files & .rej/.orig >> Reviewed by: cem, avg >> MFC after: 2 weeks > > > Hi, > > I was wondering if you might consider reverting this change? > Alternatively, can you teach me how to override this file > locally without carrying a diff? > > I'm asking because this makes life painful for my workflow. > > Having git clean be able to handle .orig and .rej is incredibly > handy when applying large patch sets. It makes finding a rejected > patch as simple as 'git clean -n | grep rej'. > Would =E2=80=98git clean -n -x=E2=80=99 work for you? -x Don=E2=80=99t use the standard ignore rules (see gitignore(5)= ), = but still use the ignore rules given with -e options from the command = line. This allows removing all untracked files, including build = products. This can be used (possibly in conjunction with git restore or git = reset) to create a pristine working directory to test a clean = build. Alternatively, the gitignore(5) man page also mentions that patterns can = be listed in =E2=80=A2 Patterns read from $GIT_DIR/info/exclude. =E2=80=A2 Patterns read from the file specified by the configur= ation = variable core.excludesFile. So I=E2=80=99d think you can overrule things you don=E2=80=99t like from = the repo = gitignore file in $GIT_DIR/info/exclude or in your global git = configuration, especially combined with this: =E2=80=A2 An optional prefix "!" which negates the pattern; any= = matching file excluded by a previous pattern will become included again. = It is not possible to re-include a file if a parent directory of that = file is excluded. Git doesn=E2=80=99t list excluded directories for = performance reasons, so any patterns on contained files have no effect, = no matter where they are defined. Put a backslash ("\") in front of = the first "!" for patterns that begin with a literal "!", for example, "\!important!.txt". Kristof --=_MailMate_E4A34644-1547-4932-84FE-3FB51D1FD281_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 11 Feb 2022, at 2:25, Andrew Gallatin wrote:

On 1/17/22 04:35, Alexander V. Cher= nikov wrote:

The branch main has been updated by melifaro:

URL: https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=3D= b1f7154cb12517162a51d19ae19ec3f2dee88e11__;!!OToaGQ!4Lozvj8S2Opxre6qHuywX= _aNhwm1heXl1CyQyb0N5f_fiBJEkTQGhLzE7KlqqP9C7A$

commit b1f7154cb12517162a51d19ae19ec3f2dee88e11
Author: Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2022-01-08 16:14:47 +0000
Commit: Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2022-01-17 09:35:15 +0000

gitignore: ignore vim swap files & .rej/.orig
Reviewed by: cem, avg
MFC after: 2 weeks

Hi,

I was wondering if you might consider reverting this chan= ge?
Alternatively, can you teach me how to override this file
locally without carrying a diff?

I'm asking because this makes life painful for my workflo= w.

Having git clean be able to handle .orig and .rej is incr= edibly
handy when applying large patch sets. It makes finding a rejected
patch as simple as 'git clean -n | grep rej'.


Would =E2=80=98git clean -n -x=E2=80=99 work for you?

= 
   -x
       Don=E2=80=99t use the standard ignore rules (see gitignore(5)), bu=
t still use
       the ignore rules given with -e options from the command line. This=

       allows removing all untracked files, including build products. Thi=
s
       can be used (possibly in conjunction with git restore or git reset=
)
       to create a pristine working directory to test a clean build.

Alternatively, the gitignore(5) man page also mentions th= at patterns can be listed in

   =E2=80=A2   Patterns read from $GIT_DIR/info/exclude.

   =E2=80=A2   Patterns read from the file specified by the configuration=
 variable
       core.excludesFile.

So I=E2=80=99d think you can overrule things you don=E2=80= =99t like from the repo gitignore file in $GIT_DIR/info/exclude or in you= r global git configuration, especially combined with this:

   =E2=80=A2   An optional prefix "!" which nega=
tes the pattern; any matching file
       excluded by a previous pattern will become included again. It is n=
ot
       possible to re-include a file if a parent directory of that file i=
s
       excluded. Git doesn=E2=80=99t list excluded directories for perfor=
mance
       reasons, so any patterns on contained files have no effect, no mat=
ter
       where they are defined. Put a backslash ("\") in front o=
f the first
       "!" for patterns that begin with a literal "!"=
, for example,
       "\!important!.txt".

Kristof

--=_MailMate_E4A34644-1547-4932-84FE-3FB51D1FD281_=--