Merge pull request #893 from dahlbyk/unignore-github-path

Fix ignoring .github path

Author: dahlbyk

src/GitUtils.ps1

@@ -446,7 +446,8 @@ function InDotGitOrBareRepoDir([string][ValidateNotNullOrEmpty()]$GitDir) {
     # The latter is more desirable.
     $pathInfo = Microsoft.PowerShell.Management\Get-Location
     $currentPath = if ($pathInfo.Drive) { $pathInfo.Path } else { $pathInfo.ProviderPath }
-    $res = $currentPath.StartsWith($GitDir, (Get-PathStringComparison))
+    $separator = [System.IO.Path]::DirectorySeparatorChar
+    $res = "$currentPath$separator".StartsWith("$GitDir$separator", (Get-PathStringComparison))
     $res
 }
 

test/Get-GitStatus.Tests.ps1

@@ -24,6 +24,17 @@ Describe 'Get-GitStatus Tests' {
             $status = Get-GitStatus
             Should -Invoke -ModuleName posh-git -CommandName git -Exactly 1
             $status.Branch | Should -Be "rkeithill/more-status-tests"
+            $status.HasIndex | Should -Be $false
+            $status.HasUntracked | Should -Be $false
+            $status.HasWorking | Should -Be $false
+            $status.Working.Added.Count | Should -Be 0
+            $status.Working.Deleted.Count | Should -Be 0
+            $status.Working.Modified.Count | Should -Be 0
+            $status.Working.Unmerged.Count | Should -Be 0
+            $status.Index.Added.Count | Should -Be 0
+            $status.Index.Deleted.Count | Should -Be 0
+            $status.Index.Modified.Count | Should -Be 0
+            $status.Index.Unmerged.Count | Should -Be 0
         }
 
 
@@ -428,4 +439,73 @@ U  test/Unmerged.Tests.ps1
             $status.Index.Unmerged[0] | Should -Be "test/Unmerged.Tests.ps1"
         }
     }
+
+    Context 'In .git' {
+        BeforeEach {
+            [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
+            $repoPath = NewGitTempRepo
+        }
+        AfterEach {
+            Set-Location $PSScriptRoot
+            RemoveGitTempRepo $repoPath
+        }
+
+        It('Does not have files') {
+            New-Item "$repoPath/test.txt" -ItemType File
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $true
+            $status.HasWorking | Should -Be $true
+            $status.Working.Added.Count | Should -Be 1
+
+            Set-Location "$repoPath/.git" -ErrorAction Stop
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $false
+            $status.HasWorking | Should -Be $false
+            $status.Working.Added.Count | Should -Be 0
+
+            Set-Location "$repoPath/.git/refs" -ErrorAction Stop
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $false
+            $status.HasWorking | Should -Be $false
+            $status.Working.Added.Count | Should -Be 0
+        }
+    }
+
+    Context 'In .github' {
+        BeforeEach {
+            [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssigments', '')]
+            $repoPath = NewGitTempRepo
+            New-Item -Type Directory -Force "$repoPath/.github/workflows"
+        }
+        AfterEach {
+            Set-Location $PSScriptRoot
+            RemoveGitTempRepo $repoPath
+        }
+
+        It('Files are not ignored') {
+            New-Item "$repoPath/test.txt" -ItemType File
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $true
+            $status.HasWorking | Should -Be $true
+            $status.Working.Added.Count | Should -Be 1
+
+            Set-Location "$repoPath/.github" -ErrorAction Stop
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $true
+            $status.HasWorking | Should -Be $true
+            $status.Working.Added.Count | Should -Be 1
+
+            Set-Location "$repoPath/.github/workflows" -ErrorAction Stop
+
+            $status = Get-GitStatus
+            $status.HasUntracked | Should -Be $true
+            $status.HasWorking | Should -Be $true
+            $status.Working.Added.Count | Should -Be 1
+        }
+    }
 }

test/Shared.ps1

@@ -66,7 +66,8 @@ function GetHomePath() {
 }
 
 function GetHomeRelPath([string]$Path) {
-    if (!$Path.StartsWith($Home)) {
+    $separator = [System.IO.Path]::DirectorySeparatorChar
+    if (!("$Path$separator".StartsWith("$Home$separator"))) {
         # Path not under $Home
         return $Path
     }
@@ -87,7 +88,8 @@ function GetGitRelPath([string]$Path) {
     # Up one level from `.git`
     $gitPath = Split-Path $gitPath -Parent
 
-    if (!$Path.StartsWith($gitPath)) {
+    $separator = [System.IO.Path]::DirectorySeparatorChar
+    if (!"$Path$separator".StartsWith("$gitPath$separator")) {
         # Path not under $gitPath
         return $Path
     }