Change-Id: I5a6ef686c444fb1e46c9f784bad01165471ef372 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v1.3.0.201202121842-rc4
@@ -211,7 +211,7 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { | |||
private FileBasedConfig configFor(File gitDir) throws IOException, | |||
ConfigInvalidException { | |||
File configPath = new File(gitDir, "config"); | |||
File configPath = new File(gitDir, Constants.CONFIG); | |||
FileBasedConfig cfg = new FileBasedConfig(configPath, FS.DETECTED); | |||
cfg.load(); | |||
return cfg; |
@@ -326,7 +326,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
@Test | |||
public void test006_ReadUglyConfig() throws IOException, | |||
ConfigInvalidException { | |||
final File cfg = new File(db.getDirectory(), "config"); | |||
final File cfg = new File(db.getDirectory(), Constants.CONFIG); | |||
final FileBasedConfig c = new FileBasedConfig(cfg, db.getFS()); | |||
final String configStr = " [core];comment\n\tfilemode = yes\n" | |||
+ "[user]\n" | |||
@@ -361,7 +361,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { | |||
@Test | |||
public void test008_FailOnWrongVersion() throws IOException { | |||
final File cfg = new File(db.getDirectory(), "config"); | |||
final File cfg = new File(db.getDirectory(), Constants.CONFIG); | |||
final String badvers = "ihopethisisneveraversion"; | |||
final String configStr = "[core]\n" + "\trepositoryFormatVersion=" | |||
+ badvers + "\n"; |
@@ -52,6 +52,7 @@ import java.io.FileOutputStream; | |||
import java.io.IOException; | |||
import java.io.OutputStreamWriter; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.RepositoryTestCase; | |||
import org.eclipse.jgit.transport.OpenSshConfig.Host; | |||
import org.eclipse.jgit.util.FileUtils; | |||
@@ -72,7 +73,7 @@ public class OpenSshConfigTest extends RepositoryTestCase { | |||
home = new File(trash, "home"); | |||
FileUtils.mkdir(home); | |||
configFile = new File(new File(home, ".ssh"), "config"); | |||
configFile = new File(new File(home, ".ssh"), Constants.CONFIG); | |||
FileUtils.mkdir(configFile.getParentFile()); | |||
System.setProperty("user.name", "jex_junit"); |
@@ -623,7 +623,7 @@ public class BaseRepositoryBuilder<B extends BaseRepositoryBuilder, R extends Re | |||
// the user file, as these parameters must be unique to this | |||
// repository and not inherited from other files. | |||
// | |||
File path = safeFS().resolve(getGitDir(), "config"); | |||
File path = safeFS().resolve(getGitDir(), Constants.CONFIG); | |||
FileBasedConfig cfg = new FileBasedConfig(path, safeFS()); | |||
try { | |||
cfg.load(); |
@@ -322,6 +322,9 @@ public final class Constants { | |||
/** Default name for the Git repository directory */ | |||
public static final String DOT_GIT = ".git"; | |||
/** Default name for the Git repository configuration */ | |||
public static final String CONFIG = "config"; | |||
/** A bare repository typically ends with this string */ | |||
public static final String DOT_GIT_EXT = ".git"; | |||
@@ -160,8 +160,8 @@ public class FileRepository extends Repository { | |||
systemConfig = SystemReader.getInstance().openSystemConfig(null, getFS()); | |||
userConfig = SystemReader.getInstance().openUserConfig(systemConfig, | |||
getFS()); | |||
repoConfig = new FileBasedConfig(userConfig, // | |||
getFS().resolve(getDirectory(), "config"), // | |||
repoConfig = new FileBasedConfig(userConfig, getFS().resolve( | |||
getDirectory(), Constants.CONFIG), | |||
getFS()); | |||
loadSystemConfig(); |
@@ -60,6 +60,7 @@ import java.util.Map; | |||
import org.eclipse.jgit.errors.InvalidPatternException; | |||
import org.eclipse.jgit.fnmatch.FileNameMatcher; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.util.FS; | |||
import org.eclipse.jgit.util.StringUtils; | |||
@@ -92,7 +93,7 @@ public class OpenSshConfig { | |||
if (home == null) | |||
home = new File(".").getAbsoluteFile(); | |||
final File config = new File(new File(home, ".ssh"), "config"); | |||
final File config = new File(new File(home, ".ssh"), Constants.CONFIG); | |||
final OpenSshConfig osc = new OpenSshConfig(home, config); | |||
osc.refresh(); | |||
return osc; |
@@ -365,7 +365,7 @@ class WalkPushConnection extends BaseConnection implements PushConnection { | |||
final String config = "[core]\n" | |||
+ "\trepositoryformatversion = 0\n"; | |||
final byte[] bytes = Constants.encode(config); | |||
dest.writeFile(ROOT_DIR + "config", bytes); | |||
dest.writeFile(ROOT_DIR + Constants.CONFIG, bytes); | |||
} catch (IOException e) { | |||
throw new TransportException(uri, JGitText.get().cannotCreateConfig, e); | |||
} |