From 370172da32a784fa48e33fe64855bfcddfb1a5e2 Mon Sep 17 00:00:00 2001 From: "Scott Beddall (from Dev Box)" Date: Mon, 1 Apr 2024 17:41:42 -0700 Subject: [PATCH] pshell 7.4 somehow caused git show to stop working. this update resolves the problem --- eng/common/scripts/Helpers/git-helpers.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/common/scripts/Helpers/git-helpers.ps1 b/eng/common/scripts/Helpers/git-helpers.ps1 index 2365304bedcb..63f34eca5183 100644 --- a/eng/common/scripts/Helpers/git-helpers.ps1 +++ b/eng/common/scripts/Helpers/git-helpers.ps1 @@ -65,8 +65,9 @@ class ConflictedFile { # powershell ignores the newlines with and without --textconv, which results in a json file without original spacing. # by forcefully reading into the array line by line, the whitespace is preserved. we're relying on gits autoconverstion of clrf to lf # to ensure that the line endings are consistent. - Write-Host "git show $($this.LeftSource):$($this.Path)" - $tempContent = git show ("$($this.LeftSource):$($this.Path)") + $toShow = "$($this.LeftSource):$($this.Path)" -replace "\\", "/" + Write-Host "git show $toShow" + $tempContent = git show $toShow return $tempContent -split "`r?`n" } else { @@ -76,8 +77,9 @@ class ConflictedFile { [array] Right(){ if ($this.IsConflicted) { - Write-Host "git show $($this.RightSource):$($this.Path)" - $tempContent = git show ("$($this.RightSource):$($this.Path)") + $toShow = "$($this.RightSource):$($this.Path)" -replace "\\", "/" + Write-Host "git show $toShow" + $tempContent = git show $toShow return $tempContent -split "`r?`n" } else {