Browse Source

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>
stable-0.7
Robin Rosenberg 15 years ago committed by Shawn O. Pearce
parent
commit
aa4b115791
  1. 14
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

14
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

@ -215,15 +215,11 @@ public class Repository {
}
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();
}
}

Loading…
Cancel
Save