On Fri, 24 Jan 2025 13:14:54 +0100
Greg KH <[email protected]> wrote:
> On Fri, Jan 24, 2025 at 10:51:03AM +0100, Andreas Grünbacher wrote:
> > Am Fr., 24. Jan. 2025 um 09:54 Uhr schrieb Greg KH <[email protected]>:
> > > On Fri, Jan 24, 2025 at 09:37:46AM +0100, Petr Tesarik via Quilt-dev
> > > wrote:
> > > > Hi all,
> > > >
> > > > following a recent SUSE-internal discussion about differences between
> > > > patches produced by Git and patches produced by GNU diff, I wonder if
> > > > we could allow git-diff as an alternative backend in quilt.
> > > >
> > > > FWIW I am willing to send in patches, but I want to make sure they
> > > > would be appreciated before I invest my time.
> >
> > I assume you mean "git diff" as well as "git apply". Supporting those
> > would certainly help; it would probably give quilt full binary diff
> > support "for free". But that won't be easy to achieve: quilt relies on
> > GNU patch to create backup files when applying patches, and it's those
> > backup files that "quilt diff" and similar commands operate against.
>
> I don't know about 'git apply' as I don't want that, if I did I would
> use (and do use) 'git am' for when applying patches that are a quilt
> series.
>
> I think 'patch' can apply 'git diff' generated patches, but it's the
> diff itself that was the problem. Try it with changing a mode of a
> file, I don't think diff can handle that but patch can? I think that's
> the problem I run into at times with importing git patches into quilt.
>
> Petr, what was your reason for wanting to use 'git diff'?
It was in fact a few small things to reduce noise when refreshing a
patch generated with Git, and one missing feature:
* longer limit on function names in the hunk header (after the second
"@@" occurence),
* context matching in some corner cases (when a repeated line is
added, so either line can be understood as part of context),
* when a script is added, make it executable
Petr T
_______________________________________________
Quilt-dev mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/quilt-dev
