Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2012-01-02 12:24:36 +0000
committerMatthias Sohn2012-01-02 12:24:36 +0000
commit5d95cd9418a20ff72930d4549429d778181eb9ed (patch)
tree7052a6b8e05edf6e87bc05e8a27f8142cb0437ed /org.eclipse.jgit
parent617c5d91da98a09d94b012b4547164bebbf290d1 (diff)
downloadjgit-5d95cd9418a20ff72930d4549429d778181eb9ed.tar.gz
jgit-5d95cd9418a20ff72930d4549429d778181eb9ed.tar.xz
jgit-5d95cd9418a20ff72930d4549429d778181eb9ed.zip
Add constant for default name for the Git repo configuration
Change-Id: I5a6ef686c444fb1e46c9f784bad01165471ef372 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java3
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepository.java4
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java3
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java2
5 files changed, 9 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
index e4cecac777..22a2ae505d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
@@ -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();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
index 6621e54c5a..f6dff99986 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
@@ -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";
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
index 13776140d4..6cc5be5321 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepository.java
@@ -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();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java
index 20f3174b2e..a97c09bfe9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/OpenSshConfig.java
@@ -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;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
index ce710b5e11..81aa4ab2b4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java
@@ -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);
}

Back to the top