Very silly idea

Author: savetheclocktower

src/git.js

@@ -81,6 +81,7 @@ function pathsAreEqual (pathA, pathB, caseInsensitive = false, useRealpath = tru
 }
 
 function pathStartsWith (pathA, pathB, caseInsensitive = false, useRealpath = true) {
+  console.log('pathStartsWith:', pathA, pathB, caseInsensitive, useRealpath);
   if (IS_WINDOWS) {
     pathA = normalizePath(pathA, useRealpath)
     pathB = normalizePath(pathB, useRealpath)
@@ -224,7 +225,7 @@ Repository.prototype.checkoutReference = function (branch, create) {
 Repository.prototype.relativize = function (filePath) {
   let workingDirectory
   if (!filePath) return filePath
-  console.log('started with');
+  console.log('Real recursive path for:', filePath, 'is', realpathRecursive(filePath));
   filePath = normalizePath(filePath, true)
   console.log('normalized to', filePath);
 
@@ -235,18 +236,14 @@ Repository.prototype.relativize = function (filePath) {
   workingDirectory = this.getWorkingDirectory()
   console.log('WORKING DIR IS', workingDirectory);
   if (workingDirectory) {
-    console.log('comparing', filePath, 'to', workingDirectory);
-    console.log('realpath of workingDirectory is', realpath(workingDirectory));
-    console.log('realpath of filePath is', realpath(filePath));
-    if (pathStartsWith(filePath, workingDirectory, this.caseInsensitiveFs, true)) {
+    if (pathStartsWith(filePath, workingDirectory, this.caseInsensitiveFs, false)) {
       return filePath.substring(workingDirectory.length + 1)
-    } else if (pathsAreEqual(filePath, workingDirectory, this.caseInsensitiveFs, true)) {
+    } else if (pathsAreEqual(filePath, workingDirectory, this.caseInsensitiveFs, false)) {
       return ''
     }
   }
 
   if (this.openedWorkingDirectory) {
-    console.log('comparing', filePath, 'to', this.openedWorkingDirectory);
     workingDirectory = this.openedWorkingDirectory
     if (pathStartsWith(filePath, workingDirectory, this.caseInsensitiveFs, false)) {
       return filePath.substring(workingDirectory.length + 1)
@@ -367,8 +364,47 @@ function promisify (fn) {
   )
 }
 
-function realpath (unrealPath) {
+function realpathRecursive (unrealPath) {
+  console.log('realpathRecursive:', unrealPath);
+  let currentPath = unrealPath
+  let result = unrealPath
+  let remainder = ''
+  if (!path.isAbsolute(unrealPath)) {
+    return realpath(unrealPath, true)
+  }
+  while (!isRootPath(currentPath)) {
+    try {
+      result = fs.realpathSync.native(unrealPath)
+      break
+    } catch (e) {
+      if (e.message.includes('ENOENT')) {
+        currentPath = path.resolve(currentPath, '..')
+        remainder = path.relative(currentPath, unrealPath)
+      } else {
+        return unrealPath
+      }
+    }
+  }
+  if (isRootPath(currentPath)) {
+    return unrealPath
+  }
+  let finalResult = trimPath(`${result}/${remainder}`)
+  console.log(' @@@ returning', finalResult);
+  return finalResult
+}
+
+function trimPath (filePath) {
+  if (!filePath.endsWith('/')) return filePath
+  return filePath.replace(/\/$/, '')
+}
+
+function realpath (unrealPath, force = false) {
+  if (!force) {
+    return realpathRecursive(unrealPath)
+  }
   try {
+    // `fs.realpathSync.native` somehow is the only thing that can consistently
+    // normalize 8.3 "short names" in Windows to their long equivalents.
     if (typeof fs.realpathSync.native === 'function') {
       return fs.realpathSync.native(unrealPath)
     }
@@ -397,7 +433,6 @@ function openRepository (repositoryPath, search) {
   if (repository.exists()) {
     repository.caseInsensitiveFs = fs.isCaseInsensitive()
     if (symlink) {
-      repository._symlinkDirectory = repositoryPath
       const workingDirectory = repository.getWorkingDirectory()
       // On Windows, normalize both sides through realpath so that 8.3 short
       // names (e.g., RUNNER~1) and path separator differences don't prevent