Always checkout to 'master'

startersclan · Sep 27, 2023 · 7998b78 · 7998b78
1 parent 9bcda8e
commit 7998b78
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Generate-GitBranches.ps1 b/Generate-GitBranches.ps1
@@ -129,14 +129,15 @@ try {
     foreach ($g in $games) {
         $branch = "$( $g['game_platform'] )-$( $g['game_engine'] )-$( $g['game'] )"
 
-        if ($isSameRepo) {
-            { git checkout -f master } | Execute-Command
-            if ($Pull) {
-                { git pull origin master } | Execute-Command
-            }
-        }else {
-            { git rev-parse --verify master } | Execute-Command -ErrorAction SilentlyContinue
-            if ($LASTEXITCODE) { throw "No 'master' branch in the target repo: $TargetRepo. Create it using: git commit --allow-empty -m 'Init'" }
+        try {
+            { git rev-parse --verify master } | Execute-Command
+        }catch {
+            throw "No 'master' branch in the target repo: $TargetRepo. Create it using: git commit --allow-empty -m 'Init'"
+        }
+
+        { git checkout -f master } | Execute-Command
+        if ($Pull) {
+            { git pull origin master } | Execute-Command
         }
         $existingBranch = { git rev-parse --verify $branch 2>$null } | Execute-Command -ErrorAction SilentlyContinue
         if ($existingBranch) {