commit f7b45975bf4d660d596542f5efd62fd152144199 Merge: 9ca25f3a6 7f23d47f7 Author: teor teor@torproject.org Date: Wed Nov 6 16:14:06 2019 +1000

Merge branch 'bug32402_042' into bug32402_master

Merge changes from master with shellcheck fixes.

changes/bug32402 | 3 +++ changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++++-------- scripts/maint/checkShellScripts.sh | 6 +----- 6 files changed, 22 insertions(+), 15 deletions(-)

diff --cc scripts/git/git-push-all.sh index ebfa57619,7c43fe24d..a1ba754c2 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@@ -257,7 -237,7 +257,7 @@@ if [ "$PUSH_SAME" -eq 0 ]; the fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s matching remote: %s\n" \ - printf "Skipping unchanged: %s remote: %s\n" \ ++ printf "Skipping unchanged: %s matching remote: %s\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@@ -287,18 -261,20 +287,23 @@@ if [ "$PUSH_DELAY" -le 0 ]; the $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) \ + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) ++ MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) \ + || true # Skipped master branch if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) \ - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) ++ MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) \ + || true # Skipped all maint branches - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") || true # Skipped all release branches + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") ++ tr "\n" " ") || true # Skipped all release branches + printf \ + "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) \ - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) ++ MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) \ + || true # Skipped all maint test branches + printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES= fi