tools: do not mask errors on multiple commit retrieval · nodejs/node@5fc886f · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 636
• Pull requests 762
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 5fc886f

Browse filesBrowse the repository at this point in the historyBrowse files

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

1 file changed

+3-1Lines changed: 3 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tools/actions
  • commit-queue.sh

Expand file treeCollapse file tree

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 number	Diff line number	Diff line change
@@ -72,7 +72,9 @@ for pr in "$@"; do
72	72	fi
73	73
74	74	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}"
76	78
77	79	if ! git push $UPSTREAM $DEFAULT_BRANCH >> output 2>&1; then
78	80	commit_queue_failed "$pr"

0 commit comments

Comments

0 (0)