From 64b930f5a12589459539c92ab5c489e94b0a03e7 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Fri, 25 Mar 2022 09:59:35 -0700
Subject: [PATCH] Fix bot branch names (#5689)

* Fix bot branch names

* git commit -a
---
 .github/workflows/prepare-patch-release.yml  |  5 ++---
 .github/workflows/prepare-release-branch.yml | 13 +++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
index 6ef5ab051c..6ff0a84a3f 100644
--- a/.github/workflows/prepare-patch-release.yml
+++ b/.github/workflows/prepare-patch-release.yml
@@ -42,10 +42,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           msg="Prepare patch release ${{ steps.set-versions.outputs.release-version }}"
-          git add -u
-          git commit -m "$msg"
+          git commit -a -m "$msg"
           git push origin HEAD:opentelemetry-java-bot/prepare-patch-release-${{ steps.set-versions.outputs.release-version }}
           gh pr create --title "$msg" \
                        --body "$msg" \
-                       --head prepare-patch-release-${{ steps.set-versions.outputs.release-version }} \
+                       --head opentelemetry-java-bot/prepare-patch-release-${{ steps.set-versions.outputs.release-version }} \
                        --base ${{ github.ref_name }}
diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
index f6dca059d2..f194431507 100644
--- a/.github/workflows/prepare-release-branch.yml
+++ b/.github/workflows/prepare-release-branch.yml
@@ -49,12 +49,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           msg="Prepare release branch ${{ needs.prepare-release-branch.outputs.release-branch-name }}"
-          git add -u
-          git commit -m "$msg"
+          git commit -a -m "$msg"
           git push origin HEAD:opentelemetry-java-bot/prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }}
           gh pr create --title "$msg" \
                        --body "$msg" \
-                       --head prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }} \
+                       --head opentelemetry-java-bot/prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }} \
                        --base ${{ needs.prepare-release-branch.outputs.release-branch-name }}
 
   create-pull-request-against-main:
@@ -86,7 +85,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           msg="Bump snapshot version"
-          git add -u
-          git commit -m "$msg"
+          git commit -a -m "$msg"
           git push origin HEAD:opentelemetry-java-bot/bump-snapshot-version
-          gh pr create --title "$msg" --body "$msg" --head bump-snapshot-version --base main
+          gh pr create --title "$msg" \
+                       --body "$msg" \
+                       --head opentelemetry-java-bot/bump-snapshot-version \
+                       --base main