From d29697c7a150388402b6cbd735838ffd83313e53 Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@atcsim.de>
Date: Wed, 25 Jun 2025 13:21:49 +0200
Subject: [PATCH] Updated new-branch.ps1

---
 scripts/new-branch.ps1 | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/new-branch.ps1 b/scripts/new-branch.ps1
index 1632ee51..55a114d1 100755
--- a/scripts/new-branch.ps1
+++ b/scripts/new-branch.ps1
@@ -5,24 +5,24 @@
 	This PowerShell script creates a new branch in a local Git repository and switches to it.
 .PARAMETER newBranch
 	Specifies the new Git branch name
-.PARAMETER pathToRepo
-	Specifies the file path to the local Git repository (current working directory per default)
+.PARAMETER path
+	Specifies the file path to the local Git repository (current working directory by default)
 .EXAMPLE
-	PS> ./new-branch.ps1 test123
+	PS> ./new-branch.ps1 feature123
 	⏳ (1/6) Searching for Git executable...  git version 2.45.0
 	⏳ (2/6) Checking local repository...     C:\Repos\rust
 	⏳ (3/6) Fetching remote updates...       git@github.org:rust/rust.git
 	⏳ (4/6) Creating new branch...
 	⏳ (5/6) Pushing updates...
 	⏳ (6/6) Updating submodules...
-	✅ Created branch 'test123' based on 'main' in 📂rust repo in 18s.
+	✅ Repo 'rust' now on new 'feature123' branch (based on 'main', took 18s).
 .LINK
 	https://github.com/fleschutz/PowerShell
 .NOTES
 	Author: Markus Fleschutz | License: CC0
 #>
 
-param([string]$newBranch = "", [string]$pathToRepo = "$PWD")
+param([string]$newBranch = "", [string]$path = "$PWD")
 
 try {
 	if ($newBranch -eq "") { $newBranch = Read-Host "Enter the new Git branch name" }
@@ -33,38 +33,38 @@ try {
 	& git --version
 	if ($lastExitCode -ne 0) { throw "Can't execute 'git' - make sure Git is installed and available" }
 
-	Write-Host "⏳ (2/6) Checking local repository...     $pathToRepo"
-	if (-not(Test-Path "$pathToRepo" -pathType container)) { throw "Can't access repo folder: $pathToRepo" }
-	$result = (git -C "$pathToRepo" status)
-        if ($lastExitCode -ne 0) { throw "'git status' in $pathToRepo failed with exit code $lastExitCode" }
-	$repoName = (Get-Item "$pathToRepo").Name
+	Write-Host "⏳ (2/6) Checking local repository...     $path"
+	if (-not(Test-Path "$path" -pathType container)) { throw "Can't access repo folder: $path" }
+	$result = (git -C "$path" status)
+        if ($lastExitCode -ne 0) { throw "'git status' in $path failed with exit code $lastExitCode" }
+	$repoName = (Get-Item "$path").Name
 
 	Write-Host "⏳ (3/6) Fetching remote updates...       " -noNewline
-	& git -C "$pathToRepo" remote get-url origin
+	& git -C "$path" remote get-url origin
         if ($lastExitCode -ne 0) { throw "'git remote get-url origin' failed with exit code $lastExitCode" }
 
-	& git -C "$pathToRepo" fetch --all --recurse-submodules --prune --prune-tags --force
+	& git -C "$path" fetch --all --recurse-submodules --prune --prune-tags --force
 	if ($lastExitCode -ne 0) { throw "'git fetch' failed with exit code $lastExitCode" }
 
-	$currentBranch = (git -C "$pathToRepo" rev-parse --abbrev-ref HEAD)
+	$currentBranch = (git -C "$path" rev-parse --abbrev-ref HEAD)
 	if ($lastExitCode -ne 0) { throw "'git rev-parse' failed with exit code $lastExitCode" }
 
 	"⏳ (4/6) Creating new branch..."
-	& git -C "$pathToRepo" checkout -b "$newBranch"
+	& git -C "$path" checkout -b "$newBranch"
 	if ($lastExitCode -ne 0) { throw "'git checkout -b $newBranch' failed with exit code $lastExitCode" }
 
 	"⏳ (5/6) Pushing updates..."
-	& git -C "$pathToRepo" push origin "$newBranch"
+	& git -C "$path" push origin "$newBranch"
 	if ($lastExitCode -ne 0) { throw "'git push origin $newBranch' failed with exit code $lastExitCode" }
 
 	"⏳ (6/6) Updating submodules..."
-	& git -C "$pathToRepo" submodule update --init --recursive
+	& git -C "$path" submodule update --init --recursive
 	if ($lastExitCode -ne 0) { throw "'git submodule update' failed with exit code $lastExitCode" }
 
 	[int]$elapsed = $stopWatch.Elapsed.TotalSeconds
-	"✅ Created branch '$newBranch' based on '$currentBranch' in 📂$repoName repo in $($elapsed)s."
+	"✅ Repo '$repoName' now on new '$newBranch' branch (based on '$currentBranch', took $($elapsed)s)."
 	exit 0 # success
 } catch {
-	"⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"
+	"⚠️ ERROR: $($Error[0]) in script line $($_.InvocationInfo.ScriptLineNumber)"
 	exit 1
 }