improve apply-multiple-patches

Author: ds300

integration-tests/apply-multiple-patches/__snapshots__/apply-multiple-patches.test.ts.snap

@@ -6,6 +6,7 @@ patch-package 0.0.0
 Applying patches...
 left-pad@1.3.0 (1 hello) ✔
 left-pad@1.3.0 (3 world) ✔
+left-pad@1.3.0 (4 goodbye) ✔
 END SNAPSHOT"
 `;
 
@@ -26,7 +27,7 @@ exports[`Test apply-multiple-patches: 02: patch-package fails when a patch in th
 
   This error was caused because patch-package cannot apply the following patch file:
 
-    patches/left-pad+1.3.0+02+broken.patch
+    patches/left-pad+1.3.0+002+broken.patch
 
   Try removing node_modules and trying again. If that doesn't work, maybe there was
   an accidental change made to the patch file? Try recreating it by manually

integration-tests/apply-multiple-patches/apply-multiple-patches.sh

@@ -12,6 +12,12 @@ echo "SNAPSHOT: patch-package happily applies both good patches"
 patch-package
 echo "END SNAPSHOT"
 
+echo "it should work if we apply them again even though they touch the same parts of the code"
+if ! patch-package
+then
+  exit 1
+fi
+
 cp *broken.patch patches/
 
 (>&2 echo "SNAPSHOT: patch-package fails when a patch in the sequence is invalid")

integration-tests/apply-multiple-patches/left-pad+1.3.0+02+broken.patch renamed to integration-tests/apply-multiple-patches/left-pad+1.3.0+002+broken.patch

@@ -1,9 +1,9 @@
 diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
-index e90aec3..409dad7 100644
+index e90aec3..fd5a1d0 100644
 --- a/node_modules/left-pad/index.js
 +++ b/node_modules/left-pad/index.js
 @@ -1,3 +1,4 @@
-+// hello. this is the first patch
++// hello
  /* This program is free software. It comes without any warranty, to
       * the extent permitted by applicable law. You can redistribute it
       * and/or modify it under the terms of the Do What The Fuck You Want

integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+01+hello.patch renamed to integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+001+hello.patch

@@ -0,0 +1,9 @@
+diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
+index fd5a1d0..65f8689 100644
+--- a/node_modules/left-pad/index.js
++++ b/node_modules/left-pad/index.js
+@@ -1,3 +1,4 @@
++// world
+ // hello
+ /* This program is free software. It comes without any warranty, to
+      * the extent permitted by applicable law. You can redistribute it

integration-tests/apply-multiple-patches/patches/left-pad+1.3.0+003+world.patch

@@ -1,9 +1,11 @@
 diff --git a/node_modules/left-pad/index.js b/node_modules/left-pad/index.js
-index e90aec3..409dad7 100644
+index 65f8689..2f2abc3 100644
 --- a/node_modules/left-pad/index.js
 +++ b/node_modules/left-pad/index.js
-@@ -1,3 +1,4 @@
-+// hello. this is the first patch
+@@ -1,5 +1,5 @@
+ // world
+-// hello
++// goodbye
  /* This program is free software. It comes without any warranty, to
       * the extent permitted by applicable law. You can redistribute it
       * and/or modify it under the terms of the Do What The Fuck You Want