41 lines
1.4 KiB
Bash
Executable File
41 lines
1.4 KiB
Bash
Executable File
#!/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 main
|
|
git checkout $ARTEMIS_APACHE_REMOTE_NAME/main -B main
|
|
|
|
git merge --no-ff $1 -m "This closes #$*"
|
|
git branch -D $1
|