refactor: Utilize scripting options of git name-rev to simplify com…

…mand.
cypress-io · Jan 3, 2025 · 222c1ce · 222c1ce
1 parent 7452015
commit 222c1ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/basic/buildspec.yml b/basic/buildspec.yml
@@ -7,7 +7,7 @@ phases:
     commands:
       # Set COMMIT_INFO variables to send Git specifics to Cypress Cloud when recording
       # https://docs.cypress.io/guides/continuous-integration/introduction#Git-information
-      - export COMMIT_INFO_BRANCH="$(git rev-parse HEAD | xargs git name-rev | cut -d' ' -f2 | sed 's/remotes\/origin\///g') | sed 's/~.\+$//g'"
+      - export COMMIT_INFO_BRANCH="$(git rev-parse HEAD | git name-rev --stdin --name-only | sed 's/remotes\/origin\///g') | sed 's/~.\+$//g'"
       - export COMMIT_INFO_MESSAGE="$(git log -1 --pretty=%B)"
       - export COMMIT_INFO_EMAIL="$(git log -1 --pretty=%ae)"
       - export COMMIT_INFO_AUTHOR="$(git log -1 --pretty=%an)"

diff --git a/buildspec.yml b/buildspec.yml
@@ -28,7 +28,7 @@ phases:
     commands:
       # Set COMMIT_INFO variables to send Git specifics to Cypress Cloud when recording
       # https://docs.cypress.io/guides/continuous-integration/introduction#Git-information
-      - export COMMIT_INFO_BRANCH="$(git rev-parse HEAD | xargs git name-rev | cut -d' ' -f2 | sed 's/remotes\/origin\///g') | sed 's/~.\+$//g'"
+      - export COMMIT_INFO_BRANCH="$(git rev-parse HEAD | git name-rev --stdin --name-only | sed 's/remotes\/origin\///g') | sed 's/~.\+$//g'"
       - export COMMIT_INFO_MESSAGE="$(git log -1 --pretty=%B)"
       - export COMMIT_INFO_EMAIL="$(git log -1 --pretty=%ae)"
       - export COMMIT_INFO_AUTHOR="$(git log -1 --pretty=%an)"