Revert "Merge pull request #95 from atom/as-ns/fix-relativize"

This reverts commit e46f3ee, reversing
changes made to 1c9311b.

Author: Nathan Sobo

.travis.yml

@@ -5,7 +5,7 @@ notifications:
     on_success: never
     on_failure: change
 
-node_js: 10
+node_js: node
 
 git:
   depth: 10

spec/fixtures/ignored-workspace/.gitignore

@@ -1 +0,0 @@
-**.test

spec/fixtures/ignored-workspace/ignored.test

@@ -132,7 +132,6 @@ describe('git', () => {
         repo = git.open(ignoreRepoDir)
         expect(repo.isIgnored('a.txt')).toBe(true)
         expect(repo.isIgnored('subdir/subdir')).toBe(true)
-        expect(repo.isIgnored(repo.relativize(path.join(ignoreRepoDir, 'ignored.test')))).toBe(true)
       })
     })
 
@@ -855,8 +854,8 @@ describe('git', () => {
       repo = git.open(__dirname)
       const workingDirectory = repo.getWorkingDirectory()
 
-      expect(repo.relativize(path.join(workingDirectory, 'a.txt'))).toBe('./a.txt')
-      expect(repo.relativize(path.join(workingDirectory, 'a/b/c.txt'))).toBe('./a/b/c.txt')
+      expect(repo.relativize(path.join(workingDirectory, 'a.txt'))).toBe('a.txt')
+      expect(repo.relativize(path.join(workingDirectory, 'a/b/c.txt'))).toBe('a/b/c.txt')
       expect(repo.relativize('a.txt')).toBe('a.txt')
       expect(repo.relativize('/not/in/working/dir')).toBe('/not/in/working/dir')
       expect(repo.relativize(null)).toBe(null)
@@ -877,9 +876,9 @@ describe('git', () => {
         fs.symlinkSync(repoDirectory, linkDirectory)
 
         repo = git.open(linkDirectory)
-        expect(repo.relativize(path.join(repoDirectory, 'test1'))).toBe('./test1')
-        expect(repo.relativize(path.join(linkDirectory, 'test2'))).toBe('./test2')
-        expect(repo.relativize(path.join(linkDirectory, 'test2/test3'))).toBe('./test2/test3')
+        expect(repo.relativize(path.join(repoDirectory, 'test1'))).toBe('test1')
+        expect(repo.relativize(path.join(linkDirectory, 'test2'))).toBe('test2')
+        expect(repo.relativize(path.join(linkDirectory, 'test2/test3'))).toBe('test2/test3')
         expect(repo.relativize('test2/test3')).toBe('test2/test3')
       })
     })
@@ -891,17 +890,17 @@ describe('git', () => {
       repo.caseInsensitiveFs = true
       const workingDirectory = repo.getWorkingDirectory()
 
-      expect(repo.relativize(path.join(workingDirectory.toUpperCase(), 'a.txt'))).toBe('./a.txt')
-      expect(repo.relativize(path.join(workingDirectory.toUpperCase(), 'a/b/c.txt'))).toBe('./a/b/c.txt')
+      expect(repo.relativize(path.join(workingDirectory.toUpperCase(), 'a.txt'))).toBe('a.txt')
+      expect(repo.relativize(path.join(workingDirectory.toUpperCase(), 'a/b/c.txt'))).toBe('a/b/c.txt')
 
       const linkDirectory = path.join(fs.realpathSync(temp.mkdirSync('lower-case-symlink')), 'link')
       wrench.copyDirSyncRecursive(path.join(__dirname, 'fixtures/master.git'), path.join(repoDirectory, '.git'))
       fs.symlinkSync(repoDirectory, linkDirectory)
 
       repo = git.open(linkDirectory)
       repo.caseInsensitiveFs = true
-      expect(repo.relativize(path.join(linkDirectory.toUpperCase(), 'test2'))).toBe('./test2')
-      expect(repo.relativize(path.join(linkDirectory.toUpperCase(), 'test2/test3'))).toBe('./test2/test3')
+      expect(repo.relativize(path.join(linkDirectory.toUpperCase(), 'test2'))).toBe('test2')
+      expect(repo.relativize(path.join(linkDirectory.toUpperCase(), 'test2/test3'))).toBe('test2/test3')
     })
   })
 

spec/git-spec.js

@@ -169,7 +169,7 @@ Repository.prototype.relativize = function (path) {
     if (workingDirectory) {
       workingDirectory = workingDirectory.toLowerCase()
       if (lowerCasePath.startsWith(`${workingDirectory}/`)) {
-        return './' + path.substring(workingDirectory.length + 1)
+        return path.substring(workingDirectory.length + 1)
       } else if (lowerCasePath === workingDirectory) {
         return ''
       }
@@ -178,7 +178,7 @@ Repository.prototype.relativize = function (path) {
     if (this.openedWorkingDirectory) {
       workingDirectory = this.openedWorkingDirectory.toLowerCase()
       if (lowerCasePath.startsWith(`${workingDirectory}/`)) {
-        return './' + path.substring(workingDirectory.length + 1)
+        return path.substring(workingDirectory.length + 1)
       } else if (lowerCasePath === workingDirectory) {
         return ''
       }
@@ -187,15 +187,15 @@ Repository.prototype.relativize = function (path) {
     workingDirectory = this.getWorkingDirectory()
     if (workingDirectory) {
       if (path.startsWith(`${workingDirectory}/`)) {
-        return './' + path.substring(workingDirectory.length + 1)
+        return path.substring(workingDirectory.length + 1)
       } else if (path === workingDirectory) {
         return ''
       }
     }
 
     if (this.openedWorkingDirectory) {
       if (path.startsWith(`${this.openedWorkingDirectory}/`)) {
-        return './' + path.substring(this.openedWorkingDirectory.length + 1)
+        return path.substring(this.openedWorkingDirectory.length + 1)
       } else if (path === this.openedWorkingDirectory) {
         return ''
       }