[PATCH JGit 19/19] changed \r to \n per compliance with real git
From: mike.gaffney <mike.gaffney@asolutions.com>
---
.../jgit/lib/PacksFileContentsCreatorTest.java | 9 +++++----
.../spearce/jgit/lib/PacksFileContentsCreator.java | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/PacksFileContentsCreatorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/PacksFileContentsCreatorTest.java
index 8dc9109..bf61a59 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/PacksFileContentsCreatorTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/PacksFileContentsCreatorTest.java
@@ -53,7 +53,7 @@ public void testGettingPacksContentsSinglePack() throws Exception {
List<PackFile> packs = new ArrayList<PackFile>();
packs.add(new PackFile(TEST_IDX, TEST_PACK));
- assertEquals("P " + TEST_PACK.getName() + '\r', new PacksFileContentsCreator(packs).toString());
+ assertEquals("P " + TEST_PACK.getName() + "\n\n", new PacksFileContentsCreator(packs).toString());
}
public void testGettingPacksContentsMultiplePacks() throws Exception {
@@ -63,9 +63,10 @@ public void testGettingPacksContentsMultiplePacks() throws Exception {
packs.add(new PackFile(TEST_IDX, TEST_PACK));
StringBuilder expected = new StringBuilder();
- expected.append("P ").append(TEST_PACK.getName()).append("\r");
- expected.append("P ").append(TEST_PACK.getName()).append("\r");
- expected.append("P ").append(TEST_PACK.getName()).append("\r");
+ expected.append("P ").append(TEST_PACK.getName()).append('\n');
+ expected.append("P ").append(TEST_PACK.getName()).append('\n');
+ expected.append("P ").append(TEST_PACK.getName()).append('\n');
+ expected.append('\n');
assertEquals(expected.toString(), new PacksFileContentsCreator(packs).toString());
}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/PacksFileContentsCreator.java b/org.spearce.jgit/src/org/spearce/jgit/lib/PacksFileContentsCreator.java
index 0efc244..e8b90a2 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/PacksFileContentsCreator.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/PacksFileContentsCreator.java
@@ -49,8 +49,9 @@ public PacksFileContentsCreator(List<PackFile> packs) {
public String toString(){
StringBuilder builder = new StringBuilder();
for (PackFile packFile : packs) {
- builder.append("P ").append(packFile.getPackFile().getName()).append('\r');
+ builder.append("P ").append(packFile.getPackFile().getName()).append('\n');
}
+ builder.append('\n');
return builder.toString();
}
--
1.6.4.2
mr.gaffo@gmail.com <mr.gaffo@gmail.com>