golem15/msd-core
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(windows): derive nested-worktree state from normalized paths

Browse Source
This commit is contained in:
Tom Boucher
2026-05-17 01:14:57 -04:00
parent dac60313e2
commit 2782fd05fb
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
get-shit-done/bin/lib/init.cjs
View File

@@ -98,24 +98,8 @@ function getInitGitState(cwd) {
return resolved;
};
// Most reliable signal: git reports non-empty `--show-cdup` only when cwd is
// below the worktree root. This avoids short/long path alias issues on Windows.
let inNestedSubdir = false;
if (info.inside) {
try {
const cdupResult = execGit(['rev-parse', '--show-cdup'], { cwd, timeout: 5000 });
if (cdupResult.exitCode === 0) {
const cdup = String(cdupResult.stdout || '').trim().replace(/\\/g, '/');
inNestedSubdir = cdup.length > 0 && cdup !== '.' && cdup !== './';
} else {
inNestedSubdir = worktreeRoot !== null;
}
} catch {
inNestedSubdir = worktreeRoot !== null;
}
}
if (inNestedSubdir) {
const rootNorm = normalizeForCompare(worktreeRoot);
const cwdNorm = normalizeForCompare(cwd);
if (rootNorm && cwdNorm) {
@@ -130,6 +114,19 @@ function getInitGitState(cwd) {
!relNorm.startsWith('..') &&
!path.isAbsolute(relNorm);
}
} else {
// Fallback only when root/cwd normalization fails.
try {
const cdupResult = execGit(['rev-parse', '--show-cdup'], { cwd, timeout: 5000 });
if (cdupResult.exitCode === 0) {
const cdup = String(cdupResult.stdout || '').trim().replace(/\\/g, '/');
inNestedSubdir = cdup.length > 0 && cdup !== '.' && cdup !== './';
} else {
inNestedSubdir = worktreeRoot !== null;
}
} catch {
inNestedSubdir = worktreeRoot !== null;
}
}
}