Merge pull request #162 from theohbrothers/enhancement/generate-impro…

…ve-robustness-of-function-get-repositorycommithistory Enhancement (generate): Improve robustness of function `Get-RepositoryCommitHistory`
theohbrothers · Jul 22, 2024 · 9574b1a · 9574b1a
2 parents f864713 + 5f1e58f
commit 9574b1a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/PSRepositoryReleaseManager/Private/Get-RepositoryCommitHistory.ps1 b/src/PSRepositoryReleaseManager/Private/Get-RepositoryCommitHistory.ps1
@@ -21,7 +21,7 @@ function Get-RepositoryCommitHistory {
         [switch]$Merges
         ,
         [Parameter(Mandatory=$false)]
-        [string]$NoMerges
+        [switch]$NoMerges
     )
 
     try {
@@ -45,14 +45,11 @@ function Get-RepositoryCommitHistory {
             $commitSHARange = $FirstRef
         }
         $gitArgs = @(
-            '--no-pager'
-            'log'
-            "--pretty=format:$($PrettyFormat)"
-            $commitSHARange
+            if ($PrettyFormat) { "--pretty=format:$PrettyFormat" }
             if ($Merges) { '--merges' }
-            elseif ($NoMerges) { '--no-merges' }
+            if ($NoMerges) { '--no-merges' }
         )
-        $_commitHistory = git $gitArgs
+        $_commitHistory = git --no-pager log $commitSHARange @gitArgs
         "Changelog:" | Write-Verbose
         $_commitHistory | Write-Verbose
         $_commitHistory