Re: [PATCH] Remove *.orig pattern from .gitignore

[Laurent Pinchart]

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@xxxxxxxxxxxxxxxx>
> > ---
> > 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 ?

> > ---
> >  .gitignore | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/.gitignore b/.gitignore
> > index 7902adf4f7f1..58fdbb35e2f1 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -142,7 +142,6 @@ GTAGS
> >  # id-utils files
> >  ID
> >  
> > -*.orig
> >  *~
> >  \#*#
> >  
> > 
> > base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b

-- 
Regards,

Laurent Pinchart