diff options
| -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 |