File tree Expand file tree Collapse file tree 1 file changed +1
-1
lines changed
.github/actions/ensure-release-branch Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ 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- execute_command --no-std -- git merge --no-commit --no-ff " origin/$RELEASE_BRANCH "
117+ GIT_AUTHOR_NAME= " TMP " execute_command --no-std -- git merge --no-commit --no-ff " origin/$RELEASE_BRANCH "
118118 execute_command --ignore-exit-code 1 --no-std -- git diff --quiet --cached " origin/$RELEASE_VERSION_BRANCH "
119119 diff_result=$last_cmd_result
120120 execute_command --ignore-errors --no-std -- git merge --abort
You can’t perform that action at this time.
0 commit comments