You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/04/08 16:03:26 UTC
[2/2] activemq-artemis git commit: Allow override remote name in
mergePR script
Allow override remote name in mergePR script
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1d2d7d05
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1d2d7d05
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1d2d7d05
Branch: refs/heads/master
Commit: 1d2d7d05e5d9a4fb463ed1ddfbfbc99686e584f6
Parents: 2f0ecb3
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Apr 8 11:55:28 2016 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Apr 8 10:03:19 2016 -0400
----------------------------------------------------------------------
scripts/merge-PR.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1d2d7d05/scripts/merge-PR.sh
----------------------------------------------------------------------
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index b12e02f..d7225e6 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -29,13 +29,17 @@
# 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
-git fetch origin
-git fetch apache
-git fetch upstream
+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 checkout apache/master -B master
-git checkout upstream/pr/$1 -B $1
-git pull --rebase apache master
+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_GITHUB_REMOTE_NAME/pr/$1 -B $1
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
git checkout master
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1