diff options
| author | Michael Adam <obnox@samba.org> | 2020-03-20 19:53:54 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2020-03-20 19:56:12 +0100 |
| commit | d6cd5cc72950fc1ece2f28e83bcbe1cea30264f2 (patch) | |
| tree | 11419c631ca86f9311f50df544d7015f634ce1ef | |
| parent | 9e661d2ecf2da4819f7887cf96bb9103e9a07280 (diff) | |
| download | samba-integration-d6cd5cc72950fc1ece2f28e83bcbe1cea30264f2.tar.gz samba-integration-d6cd5cc72950fc1ece2f28e83bcbe1cea30264f2.tar.xz samba-integration-d6cd5cc72950fc1ece2f28e83bcbe1cea30264f2.zip | |
centos-ci: fix rebasing
Signed-off-by: Michael Adam <obnox@samba.org>
| -rwxr-xr-x | samba-integration-centos-ci-tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samba-integration-centos-ci-tests.sh b/samba-integration-centos-ci-tests.sh index 6507493..3b16301 100755 --- a/samba-integration-centos-ci-tests.sh +++ b/samba-integration-centos-ci-tests.sh @@ -56,7 +56,7 @@ then git fetch origin "pull/${ghprbPullId}/head:pr_${ghprbPullId}" git checkout "pr_${ghprbPullId}" - git rebase "${ghprbTargetBranch}" + git rebase "origin/${ghprbTargetBranch}" if [ $? -ne 0 ] ; then echo "Unable to automatically rebase to branch '${ghprbTargetBranch}'. Please rebase your PR!" exit 1 |