You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/07/11 15:33:43 UTC
[activemq-artemis-native] branch main updated: update various references to reflect default branch rename to main
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis-native.git
The following commit(s) were added to refs/heads/main by this push:
new 115bd79 update various references to reflect default branch rename to main
115bd79 is described below
commit 115bd795bd863a5a169b60c1af7c20bb03629ae0
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jul 11 16:31:52 2022 +0100
update various references to reflect default branch rename to main
---
scripts/checkout-PR.sh | 2 +-
scripts/merge-PR.sh | 14 +++++++-------
scripts/merge-branch.sh | 4 ++--
3 files changed, 10 insertions(+), 10 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..6b01d5e 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -24,12 +24,12 @@ set -e
# this script assumes the following remote entries on your config
#
-# - origin being your github fork:: https://github.com/YOU/activemq-artemis.git
-# - upstream being the github fork for apache:: https://github.com/apache/activemq-artemis.git
-# - apache being the apache origin:: https://gitbox.apache.org/repos/asf/activemq-artemis.git
+# - origin being your github fork:: https://github.com/YOU/activemq-artemis-native.git
+# - upstream being the github fork for apache:: https://github.com/apache/activemq-artemis-native.git
+# - apache being the apache origin:: https://gitbox.apache.org/repos/asf/activemq-artemis-native.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