|
|
@@ -5,7 +5,7 @@ set -euo pipefail
|
|
|
# ensure dir
|
|
|
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
|
|
|
|
|
|
-BASE_BRANCHES=( 'release-55' 'master' )
|
|
|
+BASE_BRANCHES=( 'release-56' 'release-55' 'master' )
|
|
|
|
|
|
usage() {
|
|
|
cat <<EOF
|
|
|
@@ -19,7 +19,8 @@ options:
|
|
|
upstreams branches for the current working branch.
|
|
|
The uppstream branch of the current branch are as below:
|
|
|
* release-55: [] # no upstream for 5.5 opensource edition
|
|
|
- * master: [release-55] # sync release-55 to master
|
|
|
+ * release-56: [] # no upstream for 5.6 opensource edition
|
|
|
+ * master: [release-5x] # sync release-5x to master
|
|
|
|
|
|
-b|--base:
|
|
|
The base branch of current working branch if currently is not
|
|
|
@@ -154,8 +155,11 @@ upstream_branches() {
|
|
|
release-55)
|
|
|
remote_ref "$base"
|
|
|
;;
|
|
|
+ release-56)
|
|
|
+ remote_ref "$base"
|
|
|
+ ;;
|
|
|
master)
|
|
|
- remote_refs "$base" 'release-55'
|
|
|
+ remote_refs "$base" 'release-55' 'release-56'
|
|
|
;;
|
|
|
esac
|
|
|
}
|