From d6cd5cc72950fc1ece2f28e83bcbe1cea30264f2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 20 Mar 2020 19:53:54 +0100 Subject: centos-ci: fix rebasing Signed-off-by: Michael Adam --- samba-integration-centos-ci-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit