Skip to content

Commit 48a2db3

Browse files
committed
Try to use inline config for git
1 parent 47fc7aa commit 48a2db3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/actions/ensure-release-branch/ensure-release-branch.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ if execute_command git ls-remote --heads origin "$RELEASE_VERSION_BRANCH" | grep
114114
# The reliable way to check the differences ignoring merges from version
115115
# branch into release branch is to perform a merge and check the result
116116
execute_command --no-std -- git switch -c tmp-rvb "origin/$RELEASE_VERSION_BRANCH"
117-
GIT_AUTHOR_NAME="TMP" execute_command --no-std -- git merge --no-commit --no-ff "origin/$RELEASE_BRANCH"
117+
execute_command --no-std -- git -c user.name="github-actions[bot]" \
118+
-c user.email="41898282+github-actions[bot]@users.noreply.github.com" \
119+
merge --no-commit --no-ff "origin/$RELEASE_BRANCH"
118120
execute_command --ignore-exit-code 1 --no-std -- git diff --quiet --cached "origin/$RELEASE_VERSION_BRANCH"
119121
diff_result=$last_cmd_result
120122
execute_command --ignore-errors --no-std -- git merge --abort

0 commit comments

Comments
 (0)