Read core.worktree regardless of whether .git was discovered or not
The C Git documentation stated that the core.worktree config was
not read when the .git directory was found implicitly (from the
working directory).
This was not true, and had not been so for a long time. The
documentation has been updated to document the existing behaviour.
Change-Id: If1e81b6a981b9d70e849f24872f01c110e9bc950
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index a50132b..bbc5cc2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -215,15 +215,11 @@ public Repository(final File d, final File workTree, final File objectDir,
}
if (workDir == null) {
- if (d != null) {
- // Only read core.worktree if GIT_DIR is set explicitly. See
- // git-config(1).
- String workTreeConfig = getConfig().getString("core", null, "worktree");
- if (workTreeConfig != null) {
- workDir = FS.resolve(d, workTreeConfig);
- } else {
- workDir = gitDir.getParentFile();
- }
+ String workTreeConfig = getConfig().getString("core", null, "worktree");
+ if (workTreeConfig != null) {
+ workDir = FS.resolve(d, workTreeConfig);
+ } else {
+ workDir = gitDir.getParentFile();
}
}
