From 821372c229f9828e9bf848c781c8cbac1448cfb1 Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@atcsim.de>
Date: Thu, 22 Jun 2023 08:43:11 +0200
Subject: [PATCH] Update 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 b35e96c2..d84f811b 100755
--- a/Scripts/new-branch.ps1
+++ b/Scripts/new-branch.ps1
@@ -3,54 +3,54 @@
 	Creates a new Git branch 
 .DESCRIPTION
 	This PowerShell script creates a new branch in a Git repository and switches to it.
-.PARAMETER NewBranchName
+.PARAMETER newBranch
 	Specifies the new branch name
-.PARAMETER RepoDir
+.PARAMETER repoPath
 	Specifies the path to the Git repository (current working directory per default)
 .EXAMPLE
-	PS> ./new-branch test123
+	PS> ./new-branch.ps1 test123
 .LINK
 	https://github.com/fleschutz/PowerShell
 .NOTES
 	Author: Markus Fleschutz | License: CC0
 #>
 
-param([string]$NewBranchName = "", [string]$RepoDir = "$PWD")
+param([string]$newBranch = "", [string]$repoPath = "$PWD")
 
 try {
-	if ($NewBranchName -eq "") { $NewBranchName = Read-Host "Enter new branch name" }
+	if ($newBranch -eq "") { $newBranch = Read-Host "Enter the new branch name" }
 
-	$StopWatch = [system.diagnostics.stopwatch]::startNew()
+	$stopWatch = [system.diagnostics.stopwatch]::startNew()
 
 	Write-Host "⏳ (1/6) Searching for Git executable...  " -noNewline
 	& git --version
 	if ($lastExitCode -ne "0") { throw "Can't execute 'git' - make sure Git is installed and available" }
 
-	Write-Host "⏳ (2/6) Checking repository...           📂$RepoDir"
-	if (-not(Test-Path "$RepoDir" -pathType container)) { throw "Can't access directory: $RepoDir" }
-	$RepoDirName = (Get-Item "$RepoDir").Name
+	Write-Host "⏳ (2/6) Checking local repository...     📂$repoPath"
+	if (-not(Test-Path "$repoPath" -pathType container)) { throw "Can't access directory: $repoPath" }
+	$repoPathName = (Get-Item "$repoPath").Name
 
 	"⏳ (3/6) Fetching latest updates..."
-	& git -C "$RepoDir" fetch --all --recurse-submodules --prune --prune-tags --force
+	& git -C "$repoPath" fetch --all --recurse-submodules --prune --prune-tags --force
 	if ($lastExitCode -ne "0") { throw "'git fetch' failed with exit code $lastExitCode" }
 
-	$CurrentBranchName = (git -C "$RepoDir" rev-parse --abbrev-ref HEAD)
+	$currentBranch = (git -C "$repoPath" rev-parse --abbrev-ref HEAD)
 	if ($lastExitCode -ne "0") { throw "'git rev-parse' failed with exit code $lastExitCode" }
 
 	"⏳ (4/6) Creating branch..."
-	& git -C "$RepoDir" checkout -b "$NewBranchName"
-	if ($lastExitCode -ne "0") { throw "'git checkout -b $NewBranchName' failed with exit code $lastExitCode" }
+	& git -C "$repoPath" checkout -b "$newBranch"
+	if ($lastExitCode -ne "0") { throw "'git checkout -b $newBranch' failed with exit code $lastExitCode" }
 
 	"⏳ (5/6) Pushing updates..."
-	& git -C "$RepoDir" push origin "$NewBranchName"
-	if ($lastExitCode -ne "0") { throw "'git push origin $NewBranchName' failed with exit code $lastExitCode" }
+	& git -C "$repoPath" push origin "$newBranch"
+	if ($lastExitCode -ne "0") { throw "'git push origin $newBranch' failed with exit code $lastExitCode" }
 
 	"⏳ (6/6) Updating submodules..."
-	& git -C "$RepoDir" submodule update --init --recursive
+	& git -C "$repoPath" submodule update --init --recursive
 	if ($lastExitCode -ne "0") { throw "'git submodule update' failed with exit code $lastExitCode" }
 
-	[int]$Elapsed = $StopWatch.Elapsed.TotalSeconds
-	"✔️ created branch '$NewBranchName' in repo 📂$RepoDirName (based on '$CurrentBranchName') in $Elapsed sec"
+	[int]$elapsed = $stopWatch.Elapsed.TotalSeconds
+	"✔️ created branch '$newBranch' based on '$currentBranch' in repo 📂$repoPathName in $elapsed sec"
 	exit 0 # success
 } catch {
 	"⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"