From nobody Fri Feb 11 01:25:22 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 8BBA319B0A1B; Fri, 11 Feb 2022 01:25:30 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from duke.cs.duke.edu (duke.cs.duke.edu [152.3.140.1]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jvwsj4s31z3HRN; Fri, 11 Feb 2022 01:25:29 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from [192.168.1.2] (pool-173-53-85-10.rcmdva.fios.verizon.net [173.53.85.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: gallatin) by duke.cs.duke.edu (Postfix) with ESMTPSA id 64A6EF403BD; Thu, 10 Feb 2022 20:25:23 -0500 (EST) DMARC-Filter: OpenDMARC Filter v1.3.2 duke.cs.duke.edu 64A6EF403BD DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cs.duke.edu; s=mail0816; t=1644542723; bh=gEkPGUlKaT3E8wpliElklLCzZ+mEo7Ldge5pfbZHIf8=; h=Date:Subject:To:From:From; b=t1mQMy9p4kZZi139cYfGu3YS64ty7O/X4oZon3TIOD0eqjsJV8fJVbR7xtN6j69z/ kh1MNWbn5/6Mtxzs7L+JimvRmDiDVlCAyWVD3Acmkl1pxe1Lq1YhsjjHPAVQ5wq/xV IJx/LFrlUZmVuibWseGLrFOrJaOxsM4tc5TBH9MutBL0QD5o1hjWopq8/u+L5R9cFW CcDh8kYvIm8cbrwXnpCrN0H7wnamxacY3nQ5LfrzbnPCw67tpwCYanaZBGPvupWSy5 Nv9FY04jathZ6oTYPNBCRj/msF2N/hpmQ9T5owpTb6552uCMfpgeZ1pEWxldBkVR6V A6ulHpbsz0zbw== Message-ID: <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> Date: Thu, 10 Feb 2022 20:25:22 -0500 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: git: b1f7154cb125 - main - gitignore: ignore vim swap files & .rej/.orig Content-Language: en-US To: "Alexander V. Chernikov" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org> Cc: gallatin@netflix.com, Conrad Meyer , Andriy Gapon From: Andrew Gallatin In-Reply-To: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Jvwsj4s31z3HRN X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=cs.duke.edu header.s=mail0816 header.b=t1mQMy9p; dmarc=pass (policy=none) header.from=cs.duke.edu; spf=pass (mx1.freebsd.org: domain of gallatin@cs.duke.edu designates 152.3.140.1 as permitted sender) smtp.mailfrom=gallatin@cs.duke.edu X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[cs.duke.edu:s=mail0816]; FREEFALL_USER(0.00)[gallatin]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:152.3.140.0/23]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[173.53.85.10:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[cs.duke.edu:+]; DMARC_POLICY_ALLOW(-0.50)[cs.duke.edu,none]; RCPT_COUNT_SEVEN(0.00)[7]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13371, ipnet:152.3.128.0/17, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[duke.edu:dkim] X-ThisMailContainsUnwantedMimeParts: N 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=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'. Also, when directories are removed *AND* they have an errant .orig or .rej file remaining in them, git rm will not garbage collect the directory. This causes the build to fail. I used to use the trick of 'git clean -nd' to find such directories, but now they are hidden. This scenario just cost me hours of parsing make output, trying to figure out why my build had failed. Thanks, Drew