Skip to content

FIX: normalize git paths to POSIX so sidebar tree view works #201

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

FIX: normalize git paths to POSIX so sidebar tree view works #201

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
26 changes: 17 additions & 9 deletions src/main/lib/git/utils/parse-status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@ function mapGitStatus(gitIndex: string, gitWorking: string): FileStatus {
return "modified";
}

// Normalize to POSIX separators so the renderer can safely split on "/"
// regardless of platform. Git itself stores paths with "/" on every OS, and
// Node fs / path.join accept "/" on Windows, so functionality is preserved.
function toPosix(p: string): string {
return p.replace(/\\/g, "/");
}

function toChangedFile(
path: string,
gitIndex: string,
gitWorking: string,
): ChangedFile {
return {
path,
path: toPosix(path),
status: mapGitStatus(gitIndex, gitWorking),
additions: 0,
deletions: 0,
Expand All @@ -47,8 +54,9 @@ export function parseGitStatus(

if (index && index !== " " && index !== "?") {
staged.push({
path,
oldPath: file.path !== file.from ? file.from : undefined,
path: toPosix(path),
oldPath:
file.path !== file.from && file.from ? toPosix(file.from) : undefined,
status: mapGitStatus(index, " "),
additions: 0,
deletions: 0,
Expand All @@ -57,7 +65,7 @@ export function parseGitStatus(

if (working && working !== " " && working !== "?") {
unstaged.push({
path,
path: toPosix(path),
status: mapGitStatus(" ", working),
additions: 0,
deletions: 0,
Expand Down Expand Up @@ -139,12 +147,12 @@ export function parseDiffNumstat(

const renameMatch = rawPath.match(/^(.+) => (.+)$/);
if (renameMatch) {
const oldPath = renameMatch[1];
const newPath = renameMatch[2];
const oldPath = toPosix(renameMatch[1]);
const newPath = toPosix(renameMatch[2]);
stats.set(newPath, statEntry);
stats.set(oldPath, statEntry);
} else {
stats.set(rawPath, statEntry);
stats.set(toPosix(rawPath), statEntry);
}
}

Expand Down Expand Up @@ -188,8 +196,8 @@ export function parseNameStatus(nameStatusOutput: string): ChangedFile[] {
}

files.push({
path,
oldPath,
path: toPosix(path),
oldPath: oldPath ? toPosix(oldPath) : undefined,
status,
additions: 0,
deletions: 0,
Expand Down