2 files changed, 13 insertions, 3 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/CompositeBlameCommand.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/CompositeBlameCommand.java
index 0742740bba6..a481f4a54f4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/CompositeBlameCommand.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/CompositeBlameCommand.java
@@ -22,7 +22,9 @@ package org.sonar.scm.git;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -32,6 +34,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.diff.RawTextComparator;
@@ -238,7 +241,7 @@ public class CompositeBlameCommand extends BlameCommand {
         break;
       }
       linesList.add(new BlameLine()
-        .date(fileBlame.getCommitDates()[i])
+        .date(toDate(fileBlame.getCommitDates()[i]))
         .revision(fileBlame.getCommitHashes()[i])
         .author(fileBlame.getAuthorEmails()[i]));
     }
@@ -251,4 +254,8 @@ public class CompositeBlameCommand extends BlameCommand {
     }
   }
 
+  private static @Nullable Date toDate(@Nullable Instant commitDate) {
+    return commitDate != null ? Date.from(commitDate) : null;
+  }
+
 }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
index 569999a55ab..8f066727e21 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
@@ -25,6 +25,7 @@ import java.time.Instant;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -62,6 +63,7 @@ public class NativeGitBlameCommand {
 
   private final System2 system;
   private final ProcessWrapperFactory processWrapperFactory;
+  private final Consumer<String> stderrConsumer = line -> LOG.debug("[stderr] {}", line);
   private String gitCommand;
 
   @Autowired
@@ -85,7 +87,7 @@ public class NativeGitBlameCommand {
     try {
       this.gitCommand = locateDefaultGit();
       MutableString stdOut = new MutableString();
-      this.processWrapperFactory.create(null, l -> stdOut.string = l, gitCommand, "--version").execute();
+      this.processWrapperFactory.create(null, l -> stdOut.string = l, stderrConsumer, gitCommand, "--version").execute();
       return stdOut.string != null && stdOut.string.startsWith("git version") && isCompatibleGitVersion(stdOut.string);
     } catch (Exception e) {
       LOG.debug("Failed to find git native client", e);
@@ -109,7 +111,7 @@ public class NativeGitBlameCommand {
     // To avoid it we use where.exe to find git binary only in PATH.
     LOG.debug("Looking for git command in the PATH using where.exe (Windows)");
     List<String> whereCommandResult = new LinkedList<>();
-    this.processWrapperFactory.create(null, whereCommandResult::add, "C:\\Windows\\System32\\where.exe", "$PATH:git.exe")
+    this.processWrapperFactory.create(null, whereCommandResult::add, stderrConsumer, "C:\\Windows\\System32\\where.exe", "$PATH:git.exe")
       .execute();
 
     if (!whereCommandResult.isEmpty()) {
@@ -125,6 +127,7 @@ public class NativeGitBlameCommand {
     var processWrapper = this.processWrapperFactory.create(
       baseDir,
       outputProcessor::process,
+      stderrConsumer,
       gitCommand,
       GIT_DIR_FLAG, String.format(GIT_DIR_ARGUMENT, baseDir), GIT_DIR_FORCE_FLAG, baseDir.toString(),
       BLAME_COMMAND,