Commit4758952

authored

chore(scripts): fix expression interpreted as exit code on some Bash versions (#13417)

1 parentbee4ece commit4758952Copy full SHA for 4758952

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,20 +122,19 @@ main() {`
`122`	`122`	`fi`
`123`	`123`
`124`	`124`	`if [[${title1}!="${title2}" ]];then`
`125`		`-log"Invariant failed, cherry-picked commits have different titles:${title1} !=${title2}, attempting to check commit body for cherry-pick information..."`
	`125`	`+log"Invariant failed, cherry-picked commits have different titles:\"${title1%$'\n'}\" !=\"${title2%$'\n'}\", attempting to check commit body for cherry-pick information..."`
`126`	`126`
`127`	`127`	`renamed=$(git show"${commit1}"\| sed -ne's/.cherry picked from commit $[0-9a-f]$.*/\1/p')`
`128`	`128`	`if [[-n${renamed} ]];then`
`129`	`129`	`log"Found renamed cherry-pick commit${commit1} ->${renamed}"`
`130`	`130`	`renamed_cherry_pick_commits[${commit1}]=${renamed}`
`131`	`131`	`renamed_cherry_pick_commits[${renamed}]=${commit1}`
`132`	`132`	`continue`
`133`		`-else`
`134`		`-log"Not a cherry-pick commit, adding${commit1} to pending list..."`
`135`		`-renamed_cherry_pick_commits_pending+=("${commit1}")`
`136`	`133`	`fi`
`137`		`-# error "Invariant failed, cherry-picked commits have different titles: ${title1} != ${title2}"`
`138`		`-((i--))`
	`134`	`+`
	`135`	`+log"Not a cherry-pick commit, adding${commit1} to pending list..."`
	`136`	`+renamed_cherry_pick_commits_pending+=("${commit1}")`
	`137`	`+i=$((i-1))`
`139`	`138`	`continue`
`140`	`139`	`fi`
`141`	`140`

Comments

(0)