diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2019-11-19 10:28:55 -0600 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-12-09 20:46:17 +0100 |
| commit | ebdae1d5b7916abb7e919c560b04841f0dfd21c6 (patch) | |
| tree | dff14e70bbf3d19936e45f17ebc58dc48145586b /sonar-scanner-engine/src/main/java/org | |
| parent | a98070323ef55ce3934a564e0cf49a5e8fe03971 (diff) | |
| download | sonarqube-ebdae1d5b7916abb7e919c560b04841f0dfd21c6.tar.gz sonarqube-ebdae1d5b7916abb7e919c560b04841f0dfd21c6.zip | |
SONAR-12673 Fix issue management
Diffstat (limited to 'sonar-scanner-engine/src/main/java/org')
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java | 2 | ||||
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfiguration.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java index ca4c9a32cf7..df01a38f0e0 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java @@ -158,7 +158,7 @@ public class MetadataPublisher implements ReportPublisherStep { builder.setBranchType(branchType); String referenceBranch = branchConfiguration.referenceBranchName(); if (referenceBranch != null) { - builder.setMergeBranchName(referenceBranch); + builder.setReferenceBranchName(referenceBranch); } String targetBranchName = branchConfiguration.targetBranchName(); if (targetBranchName != null) { diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfiguration.java index eaa4003f7d3..1c41bb59905 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfiguration.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/branch/BranchConfiguration.java @@ -45,8 +45,8 @@ public interface BranchConfiguration { /** * The branch from which we should load project settings/quality profiles/compare changed files/... - * For branches, it's the to default branch in case of first analysis, otherwise it's the branch itself. - * For PR, we look at sonar.pullrequest.base (default to default branch). If it exists but is a short living branch or PR, we will + * For branches, it's the default branch in case of first analysis, otherwise it's the branch itself. + * For PR, we look at sonar.pullrequest.base (default to default branch). If it exists and is not a PR we use it. If it exists but is a PR, we will * transitively use its own target. If base is not analyzed, we will use default branch. * * @return null if the branch feature is not available or no branch was specified. |