[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Quilt-dev] [PATCH RFC] Add option --preamble to diff and refresh

From: Jean Delvare
Subject: Re: [Quilt-dev] [PATCH RFC] Add option --preamble to diff and refresh
Date: Tue, 18 Oct 2022 09:04:15 +0200

Hi Andreas,

On Tue, 18 Oct 2022 02:34:10 +0200, Andreas Gr├╝nbacher wrote:
> Jean and Randy,
> Am Do., 13. Okt. 2022 um 14:43 Uhr schrieb Jean Delvare <jdelvare@suse.de>:
> > Option --preamble can be used to let quilt generate extra lines
> > before the actual diff. For now one preamble format is supported,
> > "diff", which will generate a line like:
> >  
> > > diff -- a/dir/file b/dir/file  
> >
> > This is meant to help other tools recognize the beginning of the
> > patch body, namely lore.kernel.org.  
> before adding such an awful hack to quilt, could you please pass this
> by Junio, git@vger.kernel.org, and Konstantin to see if this can be
> fixed in "git patch-id" instead? After all, this affects all quilt
> patches ever posted so far, countless others that will still be
> posted, and possibly patches generated by other tools as well.

I would definitely prefer that as well.

> > Suggested-by: Randy Dunlap <rdunlap@infradead.org>
> > Signed-off-by: Jean Delvare <jdelvare@suse.de>
> > ---
> > Randy, this is a tentative implementation of the feature you requested.
> > Please give it a try and let me know if it works for you.
> >
> > Note that I made the line start with "diff --" rather than just "diff".
> > The reason is that just matching for "^diff " could easily lead to
> > false positives as this pattern could legitimately appear in the patch
> > header. This is compatible with the way quilt currently detects the
> > start of body for git-generated patches.  
> Not sure the extra "--" is actually helping.

Can you elaborate? The reason why I added the extra "--" is explained
above, not having it would result in header trashing as soon as "diff"
is the first word on a line in the patch header.

Jean Delvare
SUSE L3 Support

reply via email to

[Prev in Thread] Current Thread [Next in Thread]