Skip to content

Fix git extension not working when repo root is "/" (chroot) #317637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanklompf wants to merge 5 commits into
base: main
Choose a base branch
from
+88 −4
Open

Fix git extension not working when repo root is "/" (chroot) #317637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ad4d28
Fix git extension not working when repo root is "/" (chroot)
cursoragent May 18, 2026
9bfe79a
Use root-aware check instead of length guard
cursoragent May 20, 2026
366ba64
Add Windows drive-root test cases for path utilities
cursoragent May 20, 2026
62be151
Merge branch 'main' into cursor/fix-root-path-trailing-slash-4e40
vanklompf May 20, 2026
7558d83
Merge branch 'main' into cursor/fix-root-path-trailing-slash-4e40
vanklompf May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 85 additions & 1 deletion extensions/git/src/test/git.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import 'mocha';
import { GitStatusParser, parseGitCommits, parseGitmodules, parseLsTree, parseLsFiles, parseGitRemotes, parseCoAuthors } from '../git';
import * as assert from 'assert';
import { splitInChunks } from '../util';
import { splitInChunks, isDescendant, pathEquals, relativePath } from '../util';

suite('git', () => {
suite('GitStatusParser', () => {
Expand Down Expand Up @@ -644,6 +644,90 @@ suite('git', () => {
});
});

suite('isDescendant', () => {
test('regular paths (posix)', function () {
if (process.platform !== 'win32') {
assert.strictEqual(isDescendant('/foo', '/foo/bar'), true);
assert.strictEqual(isDescendant('/foo/', '/foo/bar'), true);
assert.strictEqual(isDescendant('/foo', '/bar/baz'), false);
assert.strictEqual(isDescendant('/foo', '/foo'), true);
}
});

test('root path "/" (chroot environments)', function () {
if (process.platform !== 'win32') {
assert.strictEqual(isDescendant('/', '/foo'), true);
assert.strictEqual(isDescendant('/', '/foo/bar'), true);
assert.strictEqual(isDescendant('/', '/'), true);
}
});

test('regular paths (win32)', function () {
if (process.platform === 'win32') {
assert.strictEqual(isDescendant('C:\\foo', 'C:\\foo\\bar'), true);
assert.strictEqual(isDescendant('C:\\foo\\', 'C:\\foo\\bar'), true);
assert.strictEqual(isDescendant('C:\\foo', 'C:\\bar\\baz'), false);
assert.strictEqual(isDescendant('C:\\foo', 'C:\\foo'), true);
}
});

test('drive root "C:\\" (win32)', function () {
if (process.platform === 'win32') {
assert.strictEqual(isDescendant('C:\\', 'C:\\foo'), true);
assert.strictEqual(isDescendant('C:\\', 'C:\\foo\\bar'), true);
assert.strictEqual(isDescendant('C:\\', 'C:\\'), true);
}
});
});

suite('pathEquals', () => {
test('regular paths (posix)', function () {
if (process.platform !== 'win32') {
assert.strictEqual(pathEquals('/foo', '/foo'), true);
assert.strictEqual(pathEquals('/foo/', '/foo'), true);
assert.strictEqual(pathEquals('/foo', '/bar'), false);
}
});

test('root path "/"', function () {
if (process.platform !== 'win32') {
assert.strictEqual(pathEquals('/', '/'), true);
assert.strictEqual(pathEquals('/', '/foo'), false);
}
});

test('regular paths (win32)', function () {
if (process.platform === 'win32') {
assert.strictEqual(pathEquals('C:\\foo', 'C:\\foo'), true);
assert.strictEqual(pathEquals('C:\\foo\\', 'C:\\foo'), true);
assert.strictEqual(pathEquals('C:\\foo', 'C:\\bar'), false);
}
});

test('drive root "C:\\" (win32)', function () {
if (process.platform === 'win32') {
assert.strictEqual(pathEquals('C:\\', 'C:\\'), true);
assert.strictEqual(pathEquals('C:\\', 'C:\\foo'), false);
}
});
});

suite('relativePath', () => {
test('root path "/" as base (chroot environments)', function () {
if (process.platform !== 'win32') {
assert.strictEqual(relativePath('/', '/foo'), 'foo');
assert.strictEqual(relativePath('/', '/foo/bar'), 'foo/bar');
}
});

test('drive root "C:\\" as base (win32)', function () {
if (process.platform === 'win32') {
assert.strictEqual(relativePath('C:\\', 'C:\\foo'), 'foo');
assert.strictEqual(relativePath('C:\\', 'C:\\foo\\bar'), 'foo\\bar');
}
});
});

suite('splitInChunks', () => {
test('unit tests', function () {
assert.deepStrictEqual(
Expand Down
6 changes: 3 additions & 3 deletions extensions/git/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ function normalizePath(path: string): string {
path = path.toLowerCase();
}

// Trailing separator
if (/[/\\]$/.test(path)) {
// Remove trailing separator
// Trailing separator — only strip when the path is not
// a filesystem root (e.g., "/" on POSIX, "C:\" or UNC roots on Windows).
if (/[/\\]$/.test(path) && path !== dirname(path)) {
path = path.substring(0, path.length - 1);
}

Expand Down