Date: Thu, 10 Feb 2022 20:25:22 -0500 From: Andrew Gallatin <gallatin@cs.duke.edu> To: "Alexander V. Chernikov" <melifaro@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: gallatin@netflix.com, Conrad Meyer <cem@freebsd.org>, Andriy Gapon <avg@FreeBSD.org> Subject: Re: git: b1f7154cb125 - main - gitignore: ignore vim swap files & .rej/.orig Message-ID: <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> In-Reply-To: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
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 <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 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, Drewhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?72061959-88f8-d2ee-b4e9-f09ca084411e>