On Mon, 19 Aug 2024, Pali Rohár wrote:
On Monday 19 August 2024 23:46:21 Martin Storsjö wrote:
On Mon, 19 Aug 2024, Martin Storsjö wrote:
On Mon, 19 Aug 2024, Pali Rohár wrote:
However, I'm unable to apply it (git thinks the patch is
corrupted). Is this
perhaps due to the use of format-patch options like -C/-M for detecting
copies/moves here? Can you send a regular patch without those
options? That
will of course be much bigger and more annoying here on the mailing list -
or do you have a public repo somewhere, where I could grab a copy of the
commit as-is?
This change depends on other changes from UCRT patch series which is on
the list. So I'm not sure if you have applied it before or not. I think
that without them this change would not apply.
Yes, I tried to apply it on top of the others.
And yes, I have generated this change with -B -D. I can send a version
without -B -D if you want.
Yes, that'd be appreciated.
Thanks, that version of the patch did apply nicely. I pushed these patches
now, then.
// Martin
Interesting, this is first time when git's -B / -D / -C / -M options
generated patch which was not possible to apply.
Actually, I've had similar issues before, in particular with patches made
with -D, if I remember correctly. Perhaps my git version isn't quite the
latest, but still.
For earlier cases of that, where e.g. a full existing file is removed,
it's quite easy to recreate the intended end result manually. But for this
one, I didn't want to try to freestyle it myself, but rather wanted your
exact form.
// Martin
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
