diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2021-03-10 18:04:25 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-05-26 00:38:00 +0200 |
| commit | 2a0295ccfd1cf8dcb1067575f38c86f430285cda (patch) | |
| tree | 1022aa3f063a466879838292544cfd5ecf6cdeb1 /org.eclipse.jgit.test/tst-rsrc | |
| parent | 76b76a6048b9b3dbca965463d4f6f5732ffb784d (diff) | |
| download | jgit-2a0295ccfd1cf8dcb1067575f38c86f430285cda.tar.gz jgit-2a0295ccfd1cf8dcb1067575f38c86f430285cda.zip | |
ApplyCommand: handle completely empty context lines in text patches
C git treats completely empty lines as empty context lines (which
traditionally have a single blank). Apparently newer GNU diff may
produce such lines; see [1]. ("Newer" meaning "since 2006"...)
[1] https://github.com/git/git/commit/b507b465f7831
Change-Id: I80c1f030edb17a46289b1dabf11a2648d2660d38
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.test/tst-rsrc')
3 files changed, 18 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine.patch new file mode 100644 index 0000000000..18c80c4feb --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine.patch @@ -0,0 +1,10 @@ +diff --git a/emptyLine b/emptyLine +index 1fd3fa2..45c2c9b 100644 +--- a/emptyLine ++++ b/emptyLine +@@ -1,4 +1,4 @@ + foo + +-fie ++bar + fum diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PostImage new file mode 100644 index 0000000000..45c2c9ba5b --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PostImage @@ -0,0 +1,4 @@ +foo + +bar +fum diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PreImage new file mode 100644 index 0000000000..1fd3fa23b0 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/emptyLine_PreImage @@ -0,0 +1,4 @@ +foo + +fie +fum |