diff options
| author | Michael Adam <obnox@samba.org> | 2020-03-20 17:00:39 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2020-03-20 17:43:33 +0100 |
| commit | 57b86f4559f5c7293eddb484f783c67539e6f898 (patch) | |
| tree | 5335443e2a04febe8a06a9e16bb4baf6f91bd6cf | |
| parent | 087a64b1aeafe15a45fe7ed6a9a10b4b4bd31a9e (diff) | |
| download | samba-integration-57b86f4559f5c7293eddb484f783c67539e6f898.tar.gz samba-integration-57b86f4559f5c7293eddb484f783c67539e6f898.tar.xz samba-integration-57b86f4559f5c7293eddb484f783c67539e6f898.zip | |
centos-ci: rebase against the PR target branch instead of master
Needs https://github.com/gluster/centosci/pull/83 for the
ghprbTargetBranch variable to be set.
Signed-off-by: Michael Adam <obnox@samba.org>
| -rwxr-xr-x | samba-integration-centos-ci-tests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samba-integration-centos-ci-tests.sh b/samba-integration-centos-ci-tests.sh index 933b02b..6593bd7 100755 --- a/samba-integration-centos-ci-tests.sh +++ b/samba-integration-centos-ci-tests.sh @@ -55,9 +55,9 @@ then git fetch origin "pull/${ghprbPullId}/head:pr_${ghprbPullId}" git checkout "pr_${ghprbPullId}" - git rebase master + git rebase "${ghprbTargetBranch}" if [ $? -ne 0 ] ; then - echo "Unable to automatically merge master. Please rebase your patch" + echo "Unable to automatically rebase to branch '${ghprbTargetBranch}'. Please rebase your PR!" exit 1 fi fi |