From 522deca5057181adcfe5918d465ea2c535800788 Mon Sep 17 00:00:00 2001 From: Ivan Semenov Date: Fri, 4 May 2018 18:33:12 +0300 Subject: [PATCH] [git] Log git version execution results Issue: IDEA-191350 --- .../src/git4idea/config/GitExecutableManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/config/GitExecutableManager.java b/plugins/git4idea/src/git4idea/config/GitExecutableManager.java index e18a44252bbd..f7bdabd873c6 100644 --- a/plugins/git4idea/src/git4idea/config/GitExecutableManager.java +++ b/plugins/git4idea/src/git4idea/config/GitExecutableManager.java @@ -4,6 +4,7 @@ package git4idea.config; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -23,6 +24,7 @@ import org.jetbrains.annotations.Nullable; import java.io.File; import java.text.ParseException; import java.util.Collections; +import java.util.Objects; /** * Manager for "current git executable". @@ -33,6 +35,8 @@ public class GitExecutableManager { return ServiceManager.getService(GitExecutableManager.class); } + private static final Logger LOG = Logger.getInstance(GitExecutableManager.class); + @NotNull private final GitVcsApplicationSettings myApplicationSettings; @NotNull private final AtomicNotNullLazyValue myDetectedExecutable; @NotNull private final CachingFileTester myVersionCache; @@ -50,14 +54,20 @@ public class GitExecutableManager { } private static GitVersion doGetGitVersion(@NotNull String pathToGit) throws VcsException, ParseException { + LOG.debug("Acquiring git version for " + pathToGit); GitLineHandler handler = new GitLineHandler(null, new File("."), pathToGit, GitCommand.VERSION, Collections.emptyList()); handler.setPreValidateExecutable(false); + handler.setSilent(false); + handler.setStdoutSuppressed(false); GitCommandResult result = Git.getInstance().runCommand(handler); - return GitVersion.parse(result.getOutputOrThrow()); + String rawResult = result.getOutputOrThrow(); + GitVersion version = GitVersion.parse(rawResult); + LOG.info("Git version for " + pathToGit + " : " + version.getPresentation()); + return version; } @NotNull