diff --git a/Scripts/switch-branch.ps1 b/Scripts/switch-branch.ps1 index fe7e9379..82bbc2c3 100755 --- a/Scripts/switch-branch.ps1 +++ b/Scripts/switch-branch.ps1 @@ -26,7 +26,6 @@ try { "⏳ Step 1/5: Checking requirements... " $RepoDir = resolve-path "$RepoDir" if (-not(test-path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" } - set-location "$RepoDir" $Null = (git --version) if ($lastExitCode -ne "0") { throw "Can't execute 'git' - make sure Git is installed and available" } @@ -36,24 +35,24 @@ try { if ("$Result" -notmatch "nothing to commit, working tree clean") { throw "Git repository is NOT clean: $Result" } "⏳ Step 2/5: Fetching updates..." - & git fetch --all --recurse-submodules --prune --prune-tags --force - if ($lastExitCode -ne "0") { throw "'git fetch --all' failed with exit code $lastExitCode" } + & git -C "$RepoDir" fetch --all --recurse-submodules --prune --prune-tags --force + if ($lastExitCode -ne "0") { throw "'git fetch' failed with exit code $lastExitCode" } "⏳ Step 3/5: Switching branch..." - & git checkout --recurse-submodules "$BranchName" + & git -C "$RepoDir" checkout --recurse-submodules "$BranchName" if ($lastExitCode -ne "0") { throw "'git checkout $BranchName' failed with exit code $lastExitCode" } "⏳ Step 4/5: Pulling updates..." - & git pull --recurse-submodules + & git -C "$RepoDir" pull --recurse-submodules if ($lastExitCode -ne "0") { throw "'git pull' failed with exit code $lastExitCode" } "⏳ Step 5/5: Updating submodules..." - & git submodule update --init --recursive - if ($lastExitCode -ne "0") { throw "'git submodule update --init --recursive' failed with exit code $lastExitCode" } + & git -C "$RepoDir" submodule update --init --recursive + if ($lastExitCode -ne "0") { throw "'git submodule update' failed with exit code $lastExitCode" } $RepoDirName = (get-item "$RepoDir").Name [int]$Elapsed = $StopWatch.Elapsed.TotalSeconds - "✔️ switched to '$BranchName' in 📂$RepoDirName repo in $Elapsed sec" + "✔️ switched to '$BranchName' branch in 📂$RepoDirName repo in $Elapsed sec" exit 0 # success } catch { "⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"