1276e67ef7
Since :patch transforms its inputs into context-only lines, we can easily get into a state where a file diff has only context lines. git apply does not accept a "diff" without any hunk, so let's skip that.
20 lines
275 B
Plaintext
20 lines
275 B
Plaintext
Applied:
|
|
diff -ur a/file2 b/file2
|
|
--- a/file2
|
|
+++ b/file2
|
|
@@ -1 +1 @@
|
|
-file2 here
|
|
+modified file2 here
|
|
|
|
Updated buffer:
|
|
diff -ur a/file1 b/file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1 +1 @@
|
|
file1 here
|
|
diff -ur a/file2 b/file2
|
|
--- a/file2
|
|
+++ b/file2
|
|
@@ -1 +1 @@
|
|
modified file2 here
|