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?