This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 9679843 NO-JIRA renaming branch name to main on scripts
9679843 is described below
commit 9679843161894ad6b83c62bbd69c9ec8dbc1bdf7
Author: Clebert Suconic <[email protected]>
AuthorDate: Sun Apr 11 14:26:29 2021 -0400
NO-JIRA renaming branch name to main on scripts
---
scripts/checkout-PR.sh | 2 +-
scripts/merge-PR.sh | 8 ++++----
scripts/merge-branch.sh | 4 ++--
scripts/rebase-donation.sh | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/checkout-PR.sh b/scripts/checkout-PR.sh
index a354793..4c5233e 100755
--- a/scripts/checkout-PR.sh
+++ b/scripts/checkout-PR.sh
@@ -31,4 +31,4 @@ git fetch $ARTEMIS_GITHUB_REMOTE_NAME
git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
-echo "\ndo your own rebase by typing: git pull --rebase
$ARTEMIS_APACHE_REMOTE_NAME master"
+echo "\ndo your own rebase by typing: git pull --rebase
$ARTEMIS_APACHE_REMOTE_NAME main"
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index 976bacf..fb92123 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -29,7 +29,7 @@ set -e
# - apache being the apache origin::
https://gitbox.apache.org/repos/asf/activemq-artemis.git
#
# Notice: you should add +refs/pull/*/head to your fetch config on upstream
-# as specified on
https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/maintainers.md
+# as specified on
https://github.com/apache/activemq-artemis/blob/main/docs/hacking-guide/en/maintainers.md
ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:-origin}
ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:-apache}
@@ -39,9 +39,9 @@ git fetch $ARTEMIS_USER_REMOTE_NAME
git fetch $ARTEMIS_APACHE_REMOTE_NAME
git fetch $ARTEMIS_GITHUB_REMOTE_NAME
-git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/main -B main
git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
-git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
-git checkout master
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME main
+git checkout main
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1
diff --git a/scripts/merge-branch.sh b/scripts/merge-branch.sh
index 1901623..27ee83d 100755
--- a/scripts/merge-branch.sh
+++ b/scripts/merge-branch.sh
@@ -33,8 +33,8 @@ git fetch $ARTEMIS_GITHUB_REMOTE_NAME
git checkout $1
-git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
-git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME main
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/main -B main
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1
diff --git a/scripts/rebase-donation.sh b/scripts/rebase-donation.sh
index 1cec299..c5e6cb1 100755
--- a/scripts/rebase-donation.sh
+++ b/scripts/rebase-donation.sh
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-# more information about this script at
https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/history.md
+# more information about this script at
https://github.com/apache/activemq-artemis/blob/main/docs/hacking-guide/en/history.md
git remote add -f temp-hornetq https://github.com/hornetq/hornetq.git
git remote add -f temp-upstream https://github.com/apache/activemq-artemis.git
@@ -25,7 +25,7 @@ set -e
git fetch temp-hornetq
git fetch temp-upstream
git checkout temp-hornetq/apache-donation -B donation
-git checkout temp-upstream/master -B master-donation
+git checkout temp-upstream/main -B main-donation
git rebase donation
git remote rm temp-hornetq
git remote rm temp-upstream
