Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA renaming branch name to main on scripts

This commit is contained in:
Clebert Suconic 2021-04-11 14:26:29 -04:00
parent e364961c8f
commit 9679843161
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/checkout-PR.sh
View File

@ -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"

8
scripts/merge-PR.sh
View File

@ -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

4
scripts/merge-branch.sh
View File

@ -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

4
scripts/rebase-donation.sh
View File

@ -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