On Tue, Feb 01, 2022 at 19:44:24 +0000, Soft Works wrote: > > On Sun, Jan 16, 2022 at 19:16:54 +0100, Oneric wrote: > > > > In case anyone is wondering why patchwork fails to apply the second patch, > > this is probably once again because the patch updates one of FATE's ASS > > reference files which use CRLF line-endings. > > Locally git am applies both without a hitch for me on top of current master > > (and FATE passes after applying each patch). > > > You can add a .gitattributes file to tests/ref/fate/ which includes the line > > sub-webvtt2 -diff > > Then your local git format-patch will create a binary diff for the file.
Thanks for your suggestion. However, a binary diff would look like this which isn't great for seeing what's going on during review: diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2 index 357b8178ea1cf224ad47dcf78b24f1948ece6665..4cd1d86a9a58ccf65812131bf84a17531c2c6cfa 100644 GIT binary patch delta 24 gcmeys^NnXiIV;bjhJHgMV-r)eM-6?GYgs=70DwpeRR910 delta 18 Zcmeyy^MPkWIV+o?k+F%X+2m%{&j3Hw26O-b Also as noted, locally plain `git am` has no issues applying the regular (non-binary) patch; iirc patchwork uses some additional flags to make it more restrictive because regular codefiles shouldn't use CRLF line-endings. I recall using some .gitattribute settings to force crlf (without making the file binary?) were discussed last time this happened, but deemed to be not worth it because of some other issues with it. > > softworkz _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".