Merge pull request #674 from skajfes/fix-rebase-step-count

fix rebase step count
dahlbyk · Apr 11, 2019 · 22efdf9 · 22efdf9
2 parents 1572423 + d04fd23
commit 22efdf9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/GitUtils.ps1 b/src/GitUtils.ps1
@@ -82,8 +82,8 @@ function Get-GitBranch($gitDir = $(Get-GitDirectory), [Diagnostics.Stopwatch]$sw
         else {
             if (Test-Path $gitDir/rebase-apply) {
                 dbg 'Found rebase-apply' $sw
-                $step = "$(Get-Content $gitDir/rebase-merge/next)"
-                $total = "$(Get-Content $gitDir/rebase-merge/last)"
+                $step = "$(Get-Content $gitDir/rebase-apply/next)"
+                $total = "$(Get-Content $gitDir/rebase-apply/last)"
 
                 if (Test-Path $gitDir/rebase-apply/rebasing) {
                     dbg 'Found rebase-apply/rebasing' $sw