* [JGIT PATCH/RFC] Added -crlf attribute for test patch files
@ 2009-04-01 10:59 Constantine Plotnikov
0 siblings, 0 replies; only message in thread
From: Constantine Plotnikov @ 2009-04-01 10:59 UTC (permalink / raw)
To: git
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
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-01 11:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-01 10:59 [JGIT PATCH/RFC] Added -crlf attribute for test patch files Constantine Plotnikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).