diff options
author | Jacek <jacek.poreda@sonarsource.com> | 2022-01-25 10:46:10 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2022-01-25 20:03:05 +0000 |
commit | bfdb1de3bf206209016eb34f5facd6322379325b (patch) | |
tree | d1cbf088bffa0157e1bfe98df33b69c63e4cb1a9 | |
parent | 8c00e44b06dc81136484e1541400ea766612d8d6 (diff) | |
download | sonarqube-bfdb1de3bf206209016eb34f5facd6322379325b.tar.gz sonarqube-bfdb1de3bf206209016eb34f5facd6322379325b.zip |
Revert "SONAR-14929 - Detect trailing lines as new when it's a new change"
This reverts commit 1751acb739682f97c4d7e3528f16718129ecd2f7.
-rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java | 2 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java | 28 |
2 files changed, 2 insertions, 28 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java index 784b9182af0..d9157b5a3ce 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmProvider.java @@ -191,7 +191,7 @@ public class GitScmProvider extends ScmProvider { // copied from DiffCommand so that we can use a custom DiffFormatter which ignores white spaces. diffFmt.setRepository(repo); diffFmt.setProgressMonitor(NullProgressMonitor.INSTANCE); - diffFmt.setDiffComparator(RawTextComparator.DEFAULT); + diffFmt.setDiffComparator(RawTextComparator.WS_IGNORE_ALL); Path workTree = repo.getWorkTree().toPath(); String relativePath = workTree.relativize(changedFile).toString(); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java index a2c27b9c5c4..daac3162570 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java @@ -27,6 +27,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -432,33 +433,6 @@ public class GitScmProviderTest { } @Test - public void branchChangedLines_should_always_detect_trailing_lines_that_are_not_endings() throws IOException, GitAPIException { - String fileName = "file-m1.xoo"; - Path filePath = worktree.resolve(fileName); - - StringBuilder newFileContent = new StringBuilder(); - newFileContent - .append(randomizedContent(fileName, 3)) - .append("\r\n") - .append("\n"); - - createAndCommitFile(fileName, newFileContent.toString()); - ObjectId forkPoint = git.getRepository().exactRef("HEAD").getObjectId(); - - git.branchCreate().setName("b1").setStartPoint(forkPoint.getName()).call(); - git.checkout().setName("b1").call(); - - String newFileContent2 = new String(Files.readAllBytes(filePath), StandardCharsets.UTF_8) - .replaceAll("\r\n", " \n"); - Files.write(filePath, newFileContent2.getBytes(StandardCharsets.UTF_8), StandardOpenOption.TRUNCATE_EXISTING); - commit(fileName); - - assertThat(newScmProvider().branchChangedLines("master", worktree, Collections.singleton(filePath))) - .containsOnly( - entry(worktree.resolve(fileName), new HashSet<>(Arrays.asList(4)))); - } - - @Test public void branchChangedFiles_falls_back_to_origin_when_local_branch_does_not_exist() throws IOException, GitAPIException { git.branchCreate().setName("b1").call(); git.checkout().setName("b1").call(); |