> On Jul 6, 2017, at 3:42 PM, Sean Busbey <[email protected]> wrote: > > I have a patch that keeps failing to apply in yetus test-patch: > > https://issues.apache.org/jira/browse/HBASE-18327 > > I've tried regenerating the patch with git diff instead of format-patch, > I've tried using both the 0.4.0 release of yetus as well as the current > master branch. no joy. > > The patches are all generated on windows, using the git that comes from the > github desktop application. I'm at a loss; the patches all look fine when I > open them in an editor.
Oh my Mac: $ wget https://issues.apache.org/jira/secure/attachment/12875989/HBASE-18327.1.patch $ ls -al HBASE-18327.1.patch -rw-r--r--@ 1 aw staff 4656 Jul 6 16:32 HBASE-18327.1.patch $ git am HBASE-18327.1.patch Patch format detection failed. $ file HBASE-18327.1.patch HBASE-18327.1.patch: diff output text $ git apply HBASE-18327.1.patch error: unrecognized input $ patch -p1 < HBASE-18327.1.patch patch unexpectedly ends in middle of line patch: **** Only garbage was found in the patch input. $ strings HBASE-18327.1.patch $ view HBASE-18327.1.patch ... "HBASE-18327.1.patch" [converted][dos] It's gotta be a character conversion problem.
