# HG changeset patch # User glx # Date 2019-03-09 23:44:21 # Node ID 19bd53812e56cf87cd61c560664309ffef6a05ee # Parent 07a061c5b9ef5e6becc9048f0a4cc604556b62ee Fix e4cc06f67: [AzurePipelines] rebase only for PRs diff --git a/azure-pipelines/templates/ci-git-rebase.yml b/azure-pipelines/templates/ci-git-rebase.yml --- a/azure-pipelines/templates/ci-git-rebase.yml +++ b/azure-pipelines/templates/ci-git-rebase.yml @@ -5,5 +5,6 @@ steps: - bash: | git config user.email 'info@openttd.org' git config user.name 'OpenTTD CI' - git rebase origin/$SYSTEM_PULLREQUEST_TARGETBRANCH + git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH} displayName: 'Rebase to $(System.PullRequest.TargetBranch)' + condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))