Do not set core.autocrlf when creating repo

core.autorlf defaults to false, but can be set in the user or "system" config files. Note that EGit/JGit may not know where the "system" config file is located. Also fix pgm's ConfigTest which depends on default repository configuration. Bug: 382067 Change-Id: I2c698a76e30d968e7f351b4f5a2195f0b124f62f Signed-off-by: Matthias Sohn <[email protected]>
mklinger · Jun 12, 2012 · 2853c61 · 2853c61
1 parent f2d9a5e
commit 2853c61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java
@@ -42,7 +42,8 @@
  */
 package org.eclipse.jgit.pgm;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.CLIRepositoryTestCase;
@@ -60,11 +61,11 @@ public void setUp() throws Exception {
 	@Test
 	public void testListConfig() throws Exception {
 		String[] output = execute("git config --list");
-		assertArrayEquals("expected default configuration", //
-				new String[] { "core.autocrlf=false", //
-						"core.filemode=true", //
-						"core.logallrefupdates=true", //
-						"core.repositoryformatversion=0", //
-						"" /* ends with LF (last line empty) */}, output);
+		// value depends on platform
+		assertTrue(output[0].startsWith("core.filemode="));
+		assertTrue(output[0].endsWith("true") || output[0].endsWith("false"));
+		assertEquals("core.logallrefupdates=true", output[1]);
+		assertEquals("core.repositoryformatversion=0", output[2]);
+		assertEquals("", output[3]); /* ends with LF (last line empty) */
 	}
 }
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepository.java
@@ -280,8 +280,6 @@ public void create(boolean bare) throws IOException {
 					ConfigConstants.CONFIG_KEY_BARE, true);
 		cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
 				ConfigConstants.CONFIG_KEY_LOGALLREFUPDATES, !bare);
-		cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
-				ConfigConstants.CONFIG_KEY_AUTOCRLF, false);
 		cfg.save();
 	}