Kei Kebreau <kkebreau@posteo.net> writes:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Sun, Dec 24, 2017 at 06:16:29PM -0500, Kei Kebreau wrote:
>>> I've attempted to use the upstream patch, but it involves some GIT
>>> binaries which aren't supported by GNU patch. Among other hackish
>>> options, temporarily upgrading to the appropriate upstream commit may
>>> fix this for now.
>>
>> Does it work if you pass '--binary' to patch-flags?
>
> It does not. Maybe I could use 'diff --binary' to patch the files into
> existence?

Using 'diff --text' on the non-text files seems to work. The patch file
is encoded as 'raw-text' according to Emacs. Please take a look at our
bug #29849.