Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5fc886f

Browse filesBrowse files
Trotttargos
Trott
authored and
targos
committed
tools: do not mask errors on multiple commit retrieval
In commit-queue.sh, the assignment to `commits` will succeed and the script will continue if one of the two `git` commands fails, even with `-e` set. Split it into three separate assignments so that failures in the `git` commands will be clearly logged and cause the script to exit with a failure status code. PR-URL: #41340 Reviewed-By: Tierney Cyren <hello@bnb.im> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
1 parent 88d760c commit 5fc886f
Copy full SHA for 5fc886f

File tree

Expand file treeCollapse file tree

1 file changed

+3
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-1
lines changed
Open diff view settings
Collapse file

‎tools/actions/commit-queue.sh‎

Copy file name to clipboardExpand all lines: tools/actions/commit-queue.sh
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ for pr in "$@"; do
7272
fi
7373

7474
if [ -z "$MULTIPLE_COMMIT_POLICY" ]; then
75-
commits="$(git rev-parse $UPSTREAM/$DEFAULT_BRANCH)...$(git rev-parse HEAD)"
75+
start_sha=$(git rev-parse $UPSTREAM/$DEFAULT_BRANCH)
76+
end_sha=$(git rev-parse HEAD)
77+
commits="${start_sha}...${end_sha}"
7678

7779
if ! git push $UPSTREAM $DEFAULT_BRANCH >> output 2>&1; then
7880
commit_queue_failed "$pr"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.