Patch fails when created with v5

[rt2zz]

I get the following

This error was caused because Git cannot apply the following patch file:
    patches/react-scripts+1.0.17.patch
  This is usually caused by inconsistent whitespace in the patch file.

when CI tries to apply the patch that I created locally (OSX) with patch package 5. Downgrading to v3 resolves the issue.

[ds300]

Thanks for the report! Hope you don't mind answering a couple more questions:

1. What's your CI env like? Linux? Git version?
2. Did you re-create the patch file after downgrading? Or is it the one you made with v5?

[rt2zz]

1. CI i travis, default setup linux. Not sure about git version...
2. yes, I had to recreate the patch. Specifically here was my proces
   1. upgrade to v5
   2. update patch
   3. CI fail
   4. downgrade to v3
   5. CI still fail
   6. recreate patch
   7. ✅

Since the patch always applied fine locally, unfortunately I did not have the constitution to debug further on travis. My local git is 2.15

[ds300]

Thanks for those details. I'm going to look into this over the next week or so. Probably going to end up doing pure-JS patch application if I can. git-apply has been giving me a lot of grief -_-

[rt2zz]

cool, I love this package btw! thank you.

FWIW v3 is working great atm

[mauritsd]

I think I'm having the same issue, but downgrading to v3 doesn't fix the problem for me:

I get the following error after 'yarn':

**ERROR** Failed to apply patch for package react-native-maps

  This error was caused because Git cannot apply the following patch file:

    patches/react-native-maps+0.19.0.patch

  This is usually caused by inconsistent whitespace in the patch file.

If I manually try to apply the patch with "git apply -v --ignore-whitespace patches/react-native-maps+0.19.0.patch":

Checking patch node_modules/react-native-maps/lib/components/MapView.js.orig...
Checking patch node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMap.m...
Checking patch node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m...
error: while searching for:


@interface AIRGoogleMapManager() <GMSMapViewDelegate>
{
  BOOL didCallOnMapReady;
}

@end


error: patch failed: node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m:32
error: node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m: patch does not apply

If I check AIRGoogleMapManager.m:32 the content it's looking for seems to be there, but it's still failing somehow... If I apply using GNU patch with --ignore-white-space/-l set it does apply (ignore me forgetting to specify it's a unified diff ;-)):

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|patch-package
|new file mode 100644
|--- /dev/null
|+++ b/node_modules/react-native-maps/lib/components/MapView.js.orig
--------------------------
Patching file node_modules/react-native-maps/lib/components/MapView.js.orig using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- a/node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMap.m
|+++ b/node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMap.m
--------------------------
Patching file node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMap.m using Plan A...
Hunk #1 succeeded at 34.
Hunk #2 succeeded at 50.
Hunk #3 succeeded at 152.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- a/node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
|+++ b/node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m
--------------------------
Patching file node_modules/react-native-maps/lib/ios/AirGoogleMaps/AIRGoogleMapManager.m using Plan A...
Hunk #1 succeeded at 32.
Hunk #2 succeeded at 318.
done

[ds300]

Thanks for this @mauritsd — I should have some time this weekend to take a look at making the patch application js-based rather than using Git, which seems to have quite flaky behaviour across platforms and versions.

[ds300]

I looked into doing pure-js patch application and I think it would be a lot of work and there would be a bunch of edge cases to deal with, some of which I'm probably not going to anticipate before publishing.

Something I could do to mitigate this problem in the meantime would be to use patch to apply patches on *nix machines and fall back to git apply on windows. For some reason patch seems to be a lot less flaky than git apply

[mauritsd]

That'd be fine; I'm also on macOS.

Is there a definitive diagnosis as to why 'git apply' fails? I'll have a look at the patch file and the destination file with a hex editor...

[mauritsd]

I've figured out why it fails in my particular instance. When patch-package generates the diff it specifies the --ignore-space-at-eol option to git-diff. Through testing I've found out that this, when coupled with indented lines without content (e.g. " \n"), will cause git-diff to generate patch files which are not accepted by git-apply, even with --ignore-whitespace and friends. If I remove the --ignore-space-at-eol option from patch-package the patch file is a bit less clean but does apply.

Maybe an idea to allow the user to specify which git-diff options to use?

[ds300]

Thanks for the investigation! Maybe I should just not use the --ignore-space-at-eol flag? Allowing configuration of the git command would let people solve these issues on their own, but man I'd love to have something that just works for everyone. Feels like that *should* exist too.

…

On Tue, 30 Jan 2018, 15:52 Maurits Dijkstra, ***@***.***> wrote: I've figured out why it fails in my particular instance. When patch-package generates the diff it specifies the --ignore-space-at-eol option to git-diff. Through testing I've found out that this, when coupled with indented lines without content (e.g. " \n"), will cause git-diff to generate patch files which are not accepted by git-apply to fail, even with --ignore-whitespace and friends. If I remove the --ignore-space-at-eol option from patch-package the patch file is a bit less clean but does apply. Maybe an idea to allow the user to specify which git-diff options to use? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#36 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABL1qdeMznUVIzjdwFoeG7peBX7TVN5Xks5tPzqfgaJpZM4Q-Wpv> .

[mauritsd]

I think the 'right' course of action is to fix git-apply, but that's more of a long term solution...

By the way, git-merge does have an option to ignore spaces at EOL (-Xignore-space-at-eol).

[dinvlad]

Same issue here with v5 and CircleCI. Patches appear flaky from one build to another (e.g. it succeeds if I install packages on my local Mac using Yarn with --frozen-lockfile, but the same command fails in Circle). Is there a suggested workaround? Thx

EDIT: the problem reappears even when I regenerate the patch (either via patch-package and diff -u) on a local Linux system.

[dinvlad]

Moreover, downgrading to v5.0.0 (which has been working for me for an entire month) does fix the problem. So it seems there might have been some regression in the last 2 releases (5.1.0/5.1.1).

[ds300]

Thanks for the report. Weird that for you 5.1 is flaky but 5.0 is not. I didn't change the way git apply is invoked except to potentially re-order the cli options. It would be funny if that's causing the issue.

As a temporary workaround you could call patch instead of patch-package in your prepare hook. See the README for an example. I'm planning to make patch-package use it by default soon.