Skip to content

fix: normalize Windows backslash paths to forward slashes for git #21

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
quyentho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: normalize Windows backslash paths to forward slashes for git #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions src/hunkwiseGit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ import { normalizePath } from './pathNormalize';

const execFileAsync = promisify(execFile);

/**
* Convert Windows backslash paths to forward slashes for git compatibility.
* Git expects forward slashes on all platforms.
*/
function toGitPath(p: string): string {
return p.replace(/\\/g, '/');
Comment on lines +10 to +14
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toGitPath() duplicates the same backslash-to-slash normalization logic that already exists elsewhere (e.g. FileWatcher uses .replace(/\\/g, '/')). Consider centralizing this into a shared path utility (and reusing it from both places) so future path-handling fixes don’t diverge.

Suggested change
* Convert Windows backslash paths to forward slashes for git compatibility.
* Git expects forward slashes on all platforms.
*/
function toGitPath(p: string): string {
return p.replace(/\\/g, '/');
* Convert paths to git-compatible forward-slash form.
* Git expects forward slashes on all platforms.
*/
function toGitPath(p: string): string {
return normalizePath(p);

Copilot uses AI. Check for mistakes.
}
Comment on lines +9 to +15
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are existing unit tests for HunkwiseGit, but this Windows-specific path fix isn’t covered. Please add a test that exercises the new backslash→slash conversion (e.g., temporarily monkeypatch path.relative to return a value with \\ and assert snapshot()/getBaseline() (and ideally removeFile/renameFile) still succeed). This will prevent regressions while running the test suite on non-Windows CI.

Copilot uses AI. Check for mistakes.

interface Settings {
ignorePatterns: string[];
respectGitignore: boolean;
Expand Down Expand Up @@ -185,7 +193,7 @@ export class HunkwiseGit {
*/
async snapshot(filePath: string, content: string): Promise<void> {
await this.initGit();
const rel = normalizePath(path.relative(this.workTree, filePath));
const rel = toGitPath(normalizePath(path.relative(this.workTree, filePath)));
try {
const hash = await new Promise<string>((resolve, reject) => {
const child = execFile(
Expand All @@ -210,8 +218,8 @@ export class HunkwiseGit {
*/
async renameFile(oldFilePath: string, newFilePath: string): Promise<void> {
await this.initGit();
const oldRel = normalizePath(path.relative(this.workTree, oldFilePath));
const newRel = normalizePath(path.relative(this.workTree, newFilePath));
const oldRel = toGitPath(normalizePath(path.relative(this.workTree, oldFilePath)));
const newRel = toGitPath(normalizePath(path.relative(this.workTree, newFilePath)));
try {
// ls-files returns all entries matching the path (a single file or all files under a directory)
const lsOut = await this.git(['ls-files', '--stage', '--', oldRel]);
Expand All @@ -223,7 +231,7 @@ export class HunkwiseGit {
for (const line of lines) {
const m = line.match(/^(\d+) ([0-9a-f]+) \d+\t(.+)$/);
if (!m) continue;
entries.push({ mode: m[1], hash: m[2], entryRel: normalizePath(m[3]) });
entries.push({ mode: m[1], hash: m[2], entryRel: toGitPath(normalizePath(m[3])) });
}
if (entries.length === 0) return;

Expand Down Expand Up @@ -255,7 +263,7 @@ export class HunkwiseGit {
*/
async removeFile(filePath: string): Promise<void> {
await this.initGit();
const rel = normalizePath(path.relative(this.workTree, filePath));
const rel = toGitPath(normalizePath(path.relative(this.workTree, filePath)));
try {
const lsOut = await this.git(['ls-files', '--stage', '--', rel]);
if (!lsOut.trim()) return; // not tracked — nothing to remove
Expand All @@ -279,7 +287,7 @@ export class HunkwiseGit {
const entries = await Promise.all(
files.map(({ filePath, content }) =>
new Promise<{ rel: string; hash: string }>((resolve, reject) => {
const rel = normalizePath(path.relative(this.workTree, filePath));
const rel = toGitPath(normalizePath(path.relative(this.workTree, filePath)));
const child = execFile(
'git',
['hash-object', '-w', '--stdin'],
Expand Down Expand Up @@ -310,7 +318,7 @@ export class HunkwiseGit {
if (filePaths.length === 0) return;
await this.initGit();
try {
const rels = filePaths.map(fp => normalizePath(path.relative(this.workTree, fp)));
const rels = filePaths.map(fp => toGitPath(normalizePath(path.relative(this.workTree, fp))));
// Chunk to avoid exceeding OS argument length limits (~250KB on macOS)
const CHUNK = 200;
for (let i = 0; i < rels.length; i += CHUNK) {
Expand All @@ -336,7 +344,7 @@ export class HunkwiseGit {
*/
async getBaseline(filePath: string): Promise<string | undefined> {
await this.initGit();
const rel = normalizePath(path.relative(this.workTree, filePath));
const rel = toGitPath(normalizePath(path.relative(this.workTree, filePath)));
try {
return await this.git(['show', `:${rel}`]);
} catch {
Expand Down