update shell again

belav · Jul 1, 2023 · c80bab8 · c80bab8
1 parent 3c8f924
commit c80bab8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Shell/ReviewBranch.psm1 b/Shell/ReviewBranch.psm1
@@ -58,8 +58,11 @@ function CSH-ReviewBranch {
     if ($firstRun)
     {
         Set-Location $repositoryRoot
-        # TODO this should make sure the working tree is clean
-        & git checkout main
+        $checkoutMainOutput = (git checkout main) | Out-String
+        if (-not $checkoutMainOutput.Contains("Your branch is up to date with ")) {
+            return
+        }
+
         CSH-BuildProject
 
         Set-Location $pathToTestingRepo
@@ -99,7 +102,7 @@ function CSH-ReviewBranch {
 
     if ($firstRun) {
         #uses https://github.com/github/hub/releases
-        $newPr = & hub pull-request -b belav:$preBranch -m "Testing $branch"
+        $newPr = & hub pull-request -b belav:$preBranch -m "Testing $branch $folder"
         Write-Output $newPr
     }