Message-ID: <CAK7LNAQDmPeJHRWsDsv=S=NTBfpCNALEmv1CRCMsypxhOYo+Nw@mail.gmail.com>
Date: Sun, 18 Aug 2024 21:20:33 +0900
From: Masahiro Yamada <masahiroy@...nel.org>
To: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Cc: Nathan Chancellor <nathan@...nel.org>, linux-kernel@...r.kernel.org, 
	Mickaël Salaün <mic@...ikod.net>, 
	Íñigo Huguet <ihuguet@...hat.com>, 
	Thomas Weißschuh <linux@...ssschuh.net>, 
	Alexey Dobriyan <adobriyan@...ru>, S.Çağlar Onur <caglar@...dus.org.tr>
Subject: Re: [PATCH] Remove *.orig pattern from .gitignore

On Sun, Aug 18, 2024 at 4:34 AM Laurent Pinchart
<laurent.pinchart@...asonboard.com> wrote:
>
> On Wed, Jul 31, 2024 at 06:11:20PM -0700, Nathan Chancellor wrote:
> > On Mon, Jul 29, 2024 at 06:57:38PM +0300, Laurent Pinchart wrote:
> > > Commit 3f1b0e1f2875 (".gitignore update") added *.orig and *.rej
> > > patterns to .gitignore in v2.6.23. The commit message didn't give a
> > > rationale. Later on, commit 1f5d3a6b6532 ("Remove *.rej pattern from
> > > .gitignore") removed the *.rej pattern in v2.6.26, on the rationale that
> > > *.rej files indicated something went really wrong and should not be
> > > ignored.
> > >
> > > The *.rej files are now shown by `git status`, which helps located
> > > conflicts when applying patches and lowers the probability that they
> > > will go unnoticed. It is however still easy to overlook the *.orig files
> > > which slowly polute the source tree. That's not as big of a deal as not
> > > noticing a conflict, but it's still not nice.
> > >
> > > Drop the *.orig pattern from .gitignore to avoid this and help keep the
> > > source tree clean.
> > >
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> > > ---
> > > As this has been in the tree for so long and appears not to have botherd
> > > anyone, I have a strong feeling I've overlooked something and this patch
> > > will be rejected. I've actually had that feeling for a few years
> > > already, and today I decided that maybe everybody else used the exact
> > > same reasoning, explaining why the annoying *.orig pattern is still in
> > > .gitignore.
> >
> > I don't really have a strong opinion myself but it does seem reasonable
> > to be consistent. For what it's worth, Stephen Rothwell checks for
> > accidentally added .orig and .rej files in -next (and catches them
> > occasionally [1]), so I wouldn't expect removing this to matter much.
> >
> > [1]: https://lore.kernel.org/linux-next/?q=.rej
>
> I didn't know that, it's useful information, thanks. I wonder if
> checkpatch.pl could also check for that ? Although git-add already
> warns unless you specify -f, so people ignoring that may also ignore
> checkpatch.pl, I'm not sure.
>
> Who decides on whether this patch should be merged ?


This is kind of subjective, but so far, nobody has expressed
a strong opposition.

I do not have a strong opinion, because I can ignore
*.orig from my ~/.config/git/ignore anyway.

I tend to want to ignore '*.orig', so I already have
*.orig in my ~/.config/git/ignore.


I will pick up this with a little further rationale from me:




[masahiroy@...nel.org:
I do not have a strong opinion about this. Perhaps some people may have
a different opinion.

If you are someone who wants to ignore *.orig, it is likely you would
want to do so across all projects. Then, $XDG_CONFIG_HOME/git/ignore
would be more suitable for your needs. gitignore(5) suggests, "Patterns
which a user wants Git to ignore in all situations generally go into a
file specified by core.excludesFile in the user's ~/.gitconfig".

Please note that you cannot do the opposite; if *.orig is ignored by
the project's .gitignore, you cannot override the decision because
$XDG_CONFIG_HOME/git/ignore has a lower priority.

If *.orig is sitting on the fence, I'd leave it to the users. ]





-- 
Best Regards
Masahiro Yamada

Powered by blists - more mailing lists