The method RawParseUtils.nextLF(byte[],int,char) used for parsing patches expects \n as a line separator. However on MinGW git uses \r\n as line separator for text files by default, and patch files in egit/org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch are treated as text files. This caused test suit failure. To prevent test suit failure, "-crlf" attribute is added for patch files.
Signed-off-by: Constantine Plotnikov <constantine.plotnikov@gmail.com> --- I'm not completely sure whether I have fixed a correct place. MinGW itself uses \n as line separator in patches. Thus I think it is an error to have \r\n in the patch file, so I have fixed patch files rather than parsing code. Other possible solution is to fix nextLF() to handle \r\n as well.
Without this fix the egit could not be built on the maven when it is checked out using MinGW git.
.../tst-rsrc/org/spearce/jgit/patch/.gitattributes | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch/.gitattributes
Show changes to org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch/.gitattributes +1 −0
diff --git a/org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch/.gitattributes b/org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch/.gitattributes new file mode 100644 index 0000000..b38f87f --- /dev/null +++ b/org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/patch/.gitattributes @@ -0,0 +1 @@ +*.patch -crlf
-- 1.6.0.2.1172.ga5ed0