Ci/fix git script (#1159)

* update commit message

Author: calebkiage

.azure-pipelines/generation-pipeline.yml

@@ -798,7 +798,7 @@ stages:
         targetNamespace: "ApiSdk"
         customArguments: "-e '/me' -e '/me/**'"
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
-        commitMessagePrefix: "feat(generation): update request builders and models\n\n"
+        commitMessagePrefix: "feat(generation): update request builders and models"
         languageSpecificSteps:
         - template: generation-templates/cli-kiota.yml
           parameters:

.azure-pipelines/generation-templates/language-generation-kiota.yml

@@ -89,7 +89,7 @@ steps:
     BranchName: ${{ parameters.branchName }}
     PublishChanges: $(publishChanges)
     OverrideSkipCI: $(overrideSkipCI)
-    CommitMessagePrefix: $(commitMessagePrefix)
+    CommitMessagePrefix: ${{ parameters.commitMessagePrefix }}
   workingDirectory: ${{ parameters.repoName }}
 
 - pwsh: '$(scriptsDirectory)/create-pull-request.ps1'

scripts/git-push-files.ps1

@@ -12,14 +12,28 @@ if ($env:OverrideSkipCI -eq $True)
 }
 
 git add . | Write-Host
-commitMessage = "${env:CommitMessagePrefix}Update generated files with build $env:BUILD_BUILDID"
+$commitMessage = "Update generated files with build $env:BUILD_BUILDID"
 if (($env:OverrideSkipCI -eq $False) -and ($env:BUILD_REASON -eq 'Manual')) # Skip CI if manually running this pipeline.
 {
-    git commit -m "${commitMessage} [skip ci]" | Write-Host
+    if ($env:CommitMessagePrefix)
+    {
+        git commit -m "$env:CommitMessagePrefix" -m "$commitMessage [skip ci]" | Write-Host
+    }
+    else
+    {
+        git commit -m "$commitMessage [skip ci]" | Write-Host
+    }
 }
 else
 {
-    git commit -m $commitMessage | Write-Host
+    if ($env:CommitMessagePrefix)
+    {
+        git commit -m "$env:CommitMessagePrefix" -m "$commitMessage" | Write-Host
+    }
+    else
+    {
+        git commit -m "$commitMessage" | Write-Host
+    }
 }
 
 Write-Host "Added and commited generated files." -ForegroundColor Green