[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Quilt-dev] 'quilt refresh' eats valid changelog text
From: |
Andreas Grünbacher |
Subject: |
Re: [Quilt-dev] 'quilt refresh' eats valid changelog text |
Date: |
Thu, 13 May 2021 13:18:50 +0200 |
Am Do., 13. Mai 2021 um 12:30 Uhr schrieb Greg KH <greg@kroah.com>:
>
> Hi,
>
> I just got a report where quilt "ate" the changelog text of a commit
> that seems to be valid to me.
>
> If you look at the Linux kernel commit 6a4db2a60306 ("md: md_open
> returns -EBUSY when entering racing area"), it has in the body this
> text (indented here to show more obviously):
>
> For more detail, please refer with Christoph's "split mddev_find"
> patch
> in later commits.
>
> *** env ***
> kvm-qemu VM 2C1G with 2 iscsi luns
> kernel should be non-preempt
>
> *** script ***
>
> about trigger every time with below script
>
> and it goes on.
>
> But when imported into quilt, everything after, and including the line
> "*** env ***" is cut off in the changelog header.
>
> I tried to debug this myself, but I really don't understand the awk
> regex in 'refresh.in' and why this is needed:
>
> /^#? .* \| *[1-9][0-9]* / { eat = eat $0 "\n"
>
> Nor how that triggers the above.
>
> Any hints on how to resolve this?
This is a problem with function patch_header() which treats a "***" as
the start of a context diff, like "---" indicates the start of a
unified diff. The attached patch should fix the immediate problem, but
function patch_body() will need a similar treatment for a proper fix.
Andreas
patch_header.diff
Description: Text Data