From f252a0152c8b6443e0bd0a2797b1efac316e36a5 Mon Sep 17 00:00:00 2001
From: Rin <dangnhatrin90@gmail.com>
Date: Sun, 3 May 2026 20:22:18 +0700
Subject: [PATCH] fix: resolve merge conflicts and correctly escape backslashes
 in storage/git.ts

---
 gitnexus/src/storage/git.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gitnexus/src/storage/git.ts b/gitnexus/src/storage/git.ts
index ab5f9ff49..2e40935ef 100644
--- a/gitnexus/src/storage/git.ts
+++ b/gitnexus/src/storage/git.ts
@@ -121,7 +121,6 @@ export const findGitRootByDotGit = (fromPath: string): string | null => {
     }
   }
 };
-
 /**
  * Check whether a directory contains a .git entry (file or folder).
  *
@@ -172,7 +171,7 @@ export const getRemoteOriginUrl = (repoPath: string): string | null => {
 export const sanitizeRepoName = (name: string): string => {
   // 1. Prevent argument injection by stripping leading dashes.
   // 2. Remove characters that are unsafe for directory names across platforms.
-  return name.replace(/^-+/, '').replace(/[<>:\"/\\\\|?*]/g, '_') || 'unknown';
+  return name.replace(/^-+/, '').replace(/[<>:"/\\|?*]/g, '_') || 'unknown';
 };
 
 /**
@@ -186,7 +185,7 @@ export const parseRepoNameFromUrl = (url: string | null | undefined): string | n
   const trimmed = url.trim();
   if (!trimmed) return null;
   // Strip `.git` suffix (case-insensitive) and any trailing slashes.
-  const withoutSuffix = trimmed.replace(/\\.git\\/*$/i, '').replace(/\\/+$/, '');
+  const withoutSuffix = trimmed.replace(/\.git\/*$/i, '').replace(/\/+$/, '');
   
   // Last path segment, handling colons for SSH URLs.
   // For HTTPS URLs, the only colon should be in the protocol.
@@ -228,12 +227,12 @@ export interface FileDiff {
 export function parseDiffHunks(diffOutput: string): FileDiff[] {
   const files: FileDiff[] = [];
   let current: FileDiff | null = null;
-  for (const line of diffOutput.split('\\n')) {
+  for (const line of diffOutput.split('\n')) {
     if (line.startsWith('+++ b/')) {
       current = { filePath: line.slice(6), hunks: [] };
       files.push(current);
     } else if (line.startsWith('@@') && current) {
-      const match = line.match(/@@ -\\d+(?:,\\d+)? \\+(\\d+)(?:,(\\d+))? @@/);
+      const match = line.match(/@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/);
       if (match) {
         const start = parseInt(match[1], 10);
         const count = match[2] !== undefined ? parseInt(match[2], 10) : 1;