Repository: activemq-artemis Updated Branches: refs/heads/master 03bce9a12 -> 17d891858
NO-JIRA: Adding script that will checkout a PR branch Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/46c9cbe6 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/46c9cbe6 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/46c9cbe6 Branch: refs/heads/master Commit: 46c9cbe643ed46e31989549cd1b2d0cda3b33d67 Parents: 03bce9a Author: Clebert Suconic <[email protected]> Authored: Tue May 2 13:07:32 2017 -0400 Committer: Clebert Suconic <[email protected]> Committed: Tue May 2 13:16:14 2017 -0400 ---------------------------------------------------------------------- scripts/checkout-PR.sh | 34 ++++++++++++++++++++++++++++++++++ scripts/merge-branch.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46c9cbe6/scripts/checkout-PR.sh ---------------------------------------------------------------------- diff --git a/scripts/checkout-PR.sh b/scripts/checkout-PR.sh new file mode 100755 index 0000000..a354793 --- /dev/null +++ b/scripts/checkout-PR.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Setting the script to fail if anything goes wrong +set -e + +# this script is a helper that will checkout the PR Branch + +ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:-origin} +ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:-apache} +ARTEMIS_GITHUB_REMOTE_NAME=${ARTEMIS_GITHUB_REMOTE_NAME:-upstream} + +git fetch $ARTEMIS_USER_REMOTE_NAME +git fetch $ARTEMIS_APACHE_REMOTE_NAME +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" http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46c9cbe6/scripts/merge-branch.sh ---------------------------------------------------------------------- diff --git a/scripts/merge-branch.sh b/scripts/merge-branch.sh new file mode 100755 index 0000000..1901623 --- /dev/null +++ b/scripts/merge-branch.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Setting the script to fail if anything goes wrong +set -e + +# This is a helpr script to help merging branches checked out +# with checkout-PR.sh + +ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:-origin} +ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:-apache} +ARTEMIS_GITHUB_REMOTE_NAME=${ARTEMIS_GITHUB_REMOTE_NAME:-upstream} + +git fetch $ARTEMIS_USER_REMOTE_NAME +git fetch $ARTEMIS_APACHE_REMOTE_NAME +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 merge --no-ff $1 -m "This closes #$*" +git branch -D $1
