On Tue, Oct 1, 2024 at 5:44 PM <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > This is a note to let you know that I've just added the patch titled > > Remove *.orig pattern from .gitignore > > to the 6.10-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > remove-.orig-pattern-from-.gitignore.patch > and it can be found in the queue-6.10 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 Mon Sep 17 00:00:00 2001 > From: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Date: Mon, 29 Jul 2024 18:57:38 +0300 > Subject: Remove *.orig pattern from .gitignore > > From: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > commit 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 upstream. > > 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> > [masahiroy@xxxxxxxxxx: > I do not have a strong opinion about this. Perhaps some people may have > a different opinion. > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This placement of the Signed-off-by is odd. I do not see a strong reason to back-port this though. > > 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. ] > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> > --- > .gitignore | 1 - > 1 file changed, 1 deletion(-) > > --- a/.gitignore > +++ b/.gitignore > @@ -136,7 +136,6 @@ GTAGS > # id-utils files > ID > > -*.orig > *~ > \#*# > > > > Patches currently in stable-queue which might be from laurent.pinchart@xxxxxxxxxxxxxxxx are > > queue-6.10/media-platform-rzg2l-cru-rzg2l-csi2-add-missing-modu.patch > queue-6.10/remove-.orig-pattern-from-.gitignore.patch -- Best Regards Masahiro Yamada
