#!/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

export PRG_PATH=`dirname $0`
. $PRG_PATH/downstream-env.profile

echo $REDHAT_DOWNSTREAM

git fetch $REDHAT_DOWNSTREAM

git checkout $1

git pull --rebase $REDHAT_DOWNSTREAM $DOWNSTREAM_BRANCH
git checkout $REDHAT_DOWNSTREAM/$DOWNSTREAM_BRANCH -B $DOWNSTREAM_BRANCH

git merge --no-ff $1 -m "This is PR #$*"
git branch -D $1

echo ""
echo "please check everything and execute yourself this:"
echo "git push downstream $DOWNSTREAM_BRANCH"

echo ""
echo "Then you need to make sure the PR $1 is closed on github"

