From d7cbd43740bcffbdabdc0ac6e264a444e11033fd Mon Sep 17 00:00:00 2001 From: Antoine Vigneau Date: Mon, 17 Jun 2024 12:05:18 +0200 Subject: SONAR-21885 LTS Backport: Fix native Git blame with Git CLI >= 2.43 --- .../src/main/java/org/sonar/scm/git/GitBlameCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitBlameCommand.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitBlameCommand.java index 5c4003c80da..4a1e56a883d 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitBlameCommand.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitBlameCommand.java @@ -53,7 +53,7 @@ public class GitBlameCommand { private static final String MINIMUM_REQUIRED_GIT_VERSION = "2.24.0"; private static final String DEFAULT_GIT_COMMAND = "git"; private static final String BLAME_LINE_PORCELAIN_FLAG = "--line-porcelain"; - private static final String END_OF_OPTIONS_FLAG = "--end-of-options"; + private static final String FILENAME_SEPARATOR_FLAG = "--"; private static final String IGNORE_WHITESPACES = "-w"; private static final Pattern whitespaceRegex = Pattern.compile("\\s+"); @@ -128,7 +128,7 @@ public class GitBlameCommand { gitCommand, GIT_DIR_FLAG, String.format(GIT_DIR_ARGUMENT, baseDir), GIT_DIR_FORCE_FLAG, baseDir.toString(), BLAME_COMMAND, - BLAME_LINE_PORCELAIN_FLAG, IGNORE_WHITESPACES, END_OF_OPTIONS_FLAG, fileName) + BLAME_LINE_PORCELAIN_FLAG, IGNORE_WHITESPACES, FILENAME_SEPARATOR_FLAG, fileName) .execute(); } catch (UncommittedLineException e) { LOG.debug("Unable to blame file '{}' - it has uncommitted changes", fileName); -- cgit v1.2.3