Fix

startersclan · Sep 27, 2023 · a8a376f · a8a376f
1 parent 7998b78
commit a8a376f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Generate-GitBranches.Tests.ps1 b/Generate-GitBranches.Tests.ps1
@@ -47,7 +47,7 @@ Describe "Generate-GitBranches.ps1" {
             $branches.Count | Should -Be 0
         }
 
-        It "Creates and updates branches of this same repo" {
+        It "Creates and updates branches of a same repo" {
             $currentRef = git rev-parse --short HEAD
             if ($LASTEXITCODE) { throw }
             & ./Generate-GitBranches.ps1 -TargetRepo . -Pull -ErrorAction Stop 6>$null # Create

diff --git a/Generate-GitBranches.ps1 b/Generate-GitBranches.ps1
@@ -117,11 +117,16 @@ function Get-EnvFileKv ($file, $branch) {
 
 # Create new branch, remove all files except .git, create .trigger file, create .gitlab-ci.yml, commit files
 try {
-    $sourceRepo = { cd $PSScriptRoot; git rev-parse --show-toplevel; cd - } | Execute-Command -ErrorAction SilentlyContinue -WhatIf:$false
-    if ($LASTEXITCODE) { throw "$PSScriptRoot is not a git repo" }
-
-    $TargetRepo = { cd $TargetRepo; git rev-parse --show-toplevel; cd - } | Execute-Command -ErrorAction SilentlyContinue -WhatIf:$false
-    if ($LASTEXITCODE) { throw "$TargetRepo is not a git repo" }
+    try {
+        $sourceRepo = { cd $PSScriptRoot; git rev-parse --show-toplevel; cd - } | Execute-Command -WhatIf:$false  # -WhatIf:$false means execute this even if -WhatIf is passed
+    }catch {
+        throw "$PSScriptRoot is not a git repo"
+    }
+    try {
+        $TargetRepo = { cd $TargetRepo; git rev-parse --show-toplevel; cd - } | Execute-Command -WhatIf:$false  # -WhatIf:$false means execute this even if -WhatIf is passed
+    }catch {
+        throw "$TargetRepo is not a git repo"
+    }
 
     $isSameRepo = if ($TargetRepo -eq $sourceRepo) { $true } else { $false }