11e7e2964c
Patches as produced by "git format-patch" have a trailing signature that is separated from the body by a line with "-- " on it. By default it contains the Git version. We erroneously include this signature in the diff we pipe to patch, which fails to apply as a result. Add a targeted fix to suppress these signatures.
21 lines
257 B
Plaintext
21 lines
257 B
Plaintext
Applied:
|
|
diff -ur a/file1 b/file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,3 @@
|
|
context
|
|
-file1 here
|
|
+modified file1 here
|
|
context
|
|
|
|
Updated buffer:
|
|
diff -ur a/file1 b/file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,3 @@
|
|
context
|
|
modified file1 here
|
|
context
|
|
--
|
|
2.43.0
|