Re: [PATCH 5.15 00/37] 5.15.96-rc2 review

[Greg Kroah-Hartman]

On Fri, Feb 24, 2023 at 11:25:37AM +0100, Greg Kroah-Hartman wrote:
> On Thu, Feb 23, 2023 at 01:39:42PM -0800, Linus Torvalds wrote:
> > On Thu, Feb 23, 2023 at 1:24 PM Greg Kroah-Hartman
> > <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> > >
> > > Quilt should be depending on patch here, I think it's something in my
> > > set of "turn this series of patches into a mbox, split the mbox up into
> > > patches" sequence that is causing the problem.
> > 
> > Well, it might also be that quilt just re-generates the patch with
> > 'diff', and then in the process loses the information again.
> > 
> > We can happily continue to support the "we lost the executable bit",
> > since it sounds like Nathan is willing to cook up a patch.
> > 
> > I'm just too lazy and personally unaffected to care (and too busy with
> > merges - excuses, excuses).
> 
> Ok, I figured it out.  git is doing the right thing, my scripts are
> doing the right thing, patch is doing the right thing, but quilt is
> not looking at the permissions on the file at all when refreshing a
> patch that has been applied to a tree.
> 
> This might be a configuration setting on my end for quilt, or a bug in
> quilt, I'll try to track this down, but in the meantime, I've fixed up
> the stable queue of patches and pushed out a -rc3 with this hopefully
> all fixed up.

Ok, it's not quilt's fault, it's GNU diff's fault from what I can tell.
quilt relies on diff to generate the patch, and I can't figure out how
to get diff to notice file permissions at all.  Am I just missing
an option to 'diff' somewhere that I can't find in the manual?  What
tool originally generated diffs with the file permission settings that
patch can read if it wasn't 'diff'?

Anyway, quilt can handle replacing what it uses for 'diff', so I'll just
replace it with 'git diff' and that seems to solve the problem for me!

thanks,

greg k-h