Change-Id: Icfe9205994c6810fcd880054a586e9eef29df9a1 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>tags/v0.7.0
@@ -311,6 +311,9 @@ public final class Constants { | |||
/** Default name for the Git repository directory */ | |||
public static final String DOT_GIT = ".git"; | |||
/** A bare repository typically ends with this string */ | |||
public static final String DOT_GIT_EXT = ".git"; | |||
/** | |||
* Create a new digest function for objects. | |||
* |
@@ -382,8 +382,8 @@ public class RepositoryCache { | |||
final String name = directory.getName(); | |||
final File parent = directory.getParentFile(); | |||
if (isGitRepository(new File(parent, name + ".git"))) | |||
return new File(parent, name + ".git"); | |||
if (isGitRepository(new File(parent, name + Constants.DOT_GIT_EXT))) | |||
return new File(parent, name + Constants.DOT_GIT_EXT); | |||
return null; | |||
} | |||
} |
@@ -57,6 +57,7 @@ import java.util.Map; | |||
import java.util.concurrent.ConcurrentHashMap; | |||
import java.util.concurrent.CopyOnWriteArrayList; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.PersonIdent; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.RepositoryCache; | |||
@@ -204,8 +205,8 @@ public class Daemon { | |||
* the repository instance. | |||
*/ | |||
public void exportRepository(String name, final Repository db) { | |||
if (!name.endsWith(".git")) | |||
name = name + ".git"; | |||
if (!name.endsWith(Constants.DOT_GIT_EXT)) | |||
name = name + Constants.DOT_GIT_EXT; | |||
exports.put(name, db); | |||
RepositoryCache.register(db); | |||
} | |||
@@ -358,7 +359,8 @@ public class Daemon { | |||
name = name.substring(1); | |||
Repository db; | |||
db = exports.get(name.endsWith(".git") ? name : name + ".git"); | |||
db = exports.get(name.endsWith(Constants.DOT_GIT_EXT) ? name : name | |||
+ Constants.DOT_GIT_EXT); | |||
if (db != null) { | |||
db.incrementOpen(); | |||
return db; |
@@ -410,8 +410,9 @@ public class URIish { | |||
String result = elements[elements.length - 1]; | |||
if (Constants.DOT_GIT.equals(result)) | |||
result = elements[elements.length - 2]; | |||
else if (result.endsWith(DOT_GIT)) | |||
result = result.substring(0, result.length() - DOT_GIT.length()); | |||
else if (result.endsWith(Constants.DOT_GIT_EXT)) | |||
result = result.substring(0, result.length() | |||
- Constants.DOT_GIT_EXT.length()); | |||
return result; | |||
} | |||