From 3c6756b06b5f75c2047d7d8924ef8ce7cdcec8cc Mon Sep 17 00:00:00 2001
From: GuillaumeFalourd <guillaume.falourd@zup.com.br>
Date: Fri, 7 Jan 2022 11:08:35 -0300
Subject: [PATCH] update temporary branch syntax

Signed-off-by: GuillaumeFalourd <guillaume.falourd@zup.com.br>
---
 action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 38bf2c8..e5be3e9 100644
--- a/action.yml
+++ b/action.yml
@@ -88,11 +88,11 @@ runs:
         if [[ `git status --porcelain` ]]; then
           git add ${{ inputs.files }} -v
           git commit -m "${{ inputs.commit_message }}" $EMPTY
-          git branch push-and-commit-action-${{ github.run_id }}-${{ github.job }}
+          git branch git-commit-push-action-${{ github.run_id }}-${{ github.job }}
           git fetch "${{ inputs.remote_repository }}" "$CURRENT_BRANCH"
           git checkout "$CURRENT_BRANCH"
-          git merge push-and-commit-action-${{ github.run_id }}-${{ github.job }}
-          git branch -d push-and-commit-action-${{ github.run_id }}-${{ github.job }}
+          git merge git-commit-push-action-${{ github.run_id }}-${{ github.job }}
+          git branch -d git-commit-push-action-${{ github.run_id }}-${{ github.job }}
 
           git push "${{ inputs.remote_repository }}" "$CURRENT_BRANCH:$TARGET_BRANCH" --follow-tags $FORCE $TAGS        
         else
@@ -148,7 +148,7 @@ runs:
             # Won't commit if no changes were made
             git diff-index --quiet HEAD || git commit --message "${{ inputs.commit_message }}"
             git status
-            git branch copy-push-files-action-${{ github.run_id }}-${{ github.job }}
+            git branch git-commit-push-action-${{ github.run_id }}-${{ github.job }}
 
             # Create new branch (if necessary)
             BE=$(git ls-remote --heads origin ${{ inputs.target_branch }} | wc -l)
@@ -158,8 +158,8 @@ runs:
             else
               git checkout ${{ inputs.target_branch }}
             fi
-            git merge -X theirs copy-push-files-action-${{ github.run_id }}-${{ github.job }}
-            git branch -d copy-push-files-action-${{ github.run_id }}-${{ github.job }}
+            git merge -X theirs git-commit-push-action-${{ github.run_id }}-${{ github.job }}
+            git branch -d git-commit-push-action-${{ github.run_id }}-${{ github.job }}
 
             echo
             echo "##### Pushing git commit #####"