From 1bb7b22b278100612aa0d02e7c1a8ffc17f3770f Mon Sep 17 00:00:00 2001 From: Markus Fleschutz Date: Mon, 18 Oct 2021 16:46:46 +0200 Subject: [PATCH] Update switch-branch.ps1 --- Scripts/switch-branch.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/switch-branch.ps1 b/Scripts/switch-branch.ps1 index fb43dce3..14825d82 100755 --- a/Scripts/switch-branch.ps1 +++ b/Scripts/switch-branch.ps1 @@ -22,7 +22,7 @@ try { $StopWatch = [system.diagnostics.stopwatch]::startNew() - "⏳ Step 1/3: Checking requirements..." + "⏳ Checking requirements [step 1/3]... " $RepoDir = resolve-path "$RepoDir" if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" } set-location "$RepoDir" @@ -34,14 +34,14 @@ try { if ($lastExitCode -ne "0") { throw "'git status' failed in $RepoDir" } if ("$Result" -notmatch "nothing to commit, working tree clean") { throw "Git repository is NOT clean: $Result" } - "⏳ Step 2/3: Fetching latest updates and switching branch..." + "⏳ Fetching latest updates and switching branch [step 2/3]..." & git fetch --all --recurse-submodules --prune --prune-tags --force if ($lastExitCode -ne "0") { throw "'git fetch' failed" } & git checkout --recurse-submodules "$BranchName" if ($lastExitCode -ne "0") { throw "'git checkout $BranchName' failed" } - "⏳ Step 3/3: Pulling updates and updating submodules..." + "⏳ Pulling updates and updating submodules [step 3/3]..." & git pull --recurse-submodules if ($lastExitCode -ne "0") { throw "'git pull' failed" }