From 8711c990282ce56c343d6feb22ebad8648995f1a Mon Sep 17 00:00:00 2001
From: Ivan Semenov <ivan.semenov@jetbrains.com>
Date: Thu, 14 Dec 2017 18:33:14 +0300
Subject: [PATCH] Allow getting git authentication result from GitCommandResult
 fix

---
 plugins/git4idea/src/git4idea/commands/GitImpl.java           | 2 +-
 plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt | 2 +-
 .../tests/git4idea/push/GitPushOperationMultiRepoTest.kt      | 2 +-
 plugins/git4idea/tests/git4idea/test/TestGit.kt               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitImpl.java b/plugins/git4idea/src/git4idea/commands/GitImpl.java
index c938a66edad7..6c9d39cdf16a 100644
--- a/plugins/git4idea/src/git4idea/commands/GitImpl.java
+++ b/plugins/git4idea/src/git4idea/commands/GitImpl.java
@@ -641,7 +641,7 @@ public class GitImpl extends GitImplBase {
   @NotNull
   private static GitCommandResult toCancelledResult(@NotNull GitCommandResult result) {
     int exitCode = result.getExitCode() == 0 ? 1 : result.getExitCode();
-    return new GitCommandResult(false, exitCode, result.getErrorOutput(), result.getOutput()) {
+    return new GitCommandResult(false, exitCode, false, result.getErrorOutput(), result.getOutput()) {
       @Override
       public boolean cancelled() {
         return true;
diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt
index 35d7f7ee4d9c..48a0c9daffd4 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt
+++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt
@@ -664,7 +664,7 @@ class GitBranchWorkerTest : GitPlatformTest() {
       repository.git("branch todelete")
     }
     git.onBranchDelete {
-      if (second == it) GitCommandResult(false, 1, listOf("Couldn't remove branch"), listOf())
+      if (second == it) GitCommandResult(false, 1, false, listOf("Couldn't remove branch"), listOf())
       else null
     }
   }
diff --git a/plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.kt b/plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.kt
index 55b681fb0fcd..9318da5cf796 100644
--- a/plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.kt
+++ b/plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.kt
@@ -55,7 +55,7 @@ class GitPushOperationMultiRepoTest : GitPushOperationBaseTest() {
   fun `test try push from all roots even if one fails`() {
     // fail in the first repo
     git.onPush {
-      if (it == ultimate) GitCommandResult(false, 128, listOf("Failed to push to origin"), listOf<String>())
+      if (it == ultimate) GitCommandResult(false, 128, false, listOf("Failed to push to origin"), listOf<String>())
       else null
     }
 
diff --git a/plugins/git4idea/tests/git4idea/test/TestGit.kt b/plugins/git4idea/tests/git4idea/test/TestGit.kt
index 5d965737281c..493305d553ef 100644
--- a/plugins/git4idea/tests/git4idea/test/TestGit.kt
+++ b/plugins/git4idea/tests/git4idea/test/TestGit.kt
@@ -35,7 +35,7 @@ import java.io.File
  */
 val UNKNOWN_ERROR_TEXT: String = "unknown error"
 
-val SUCCESS_RESULT = GitCommandResult(true, 0, emptyList(), emptyList())
+val SUCCESS_RESULT = GitCommandResult(true, 0, false, emptyList(), emptyList())
 
 class TestGitImpl : GitImpl() {
   private val LOG = Logger.getInstance(TestGitImpl::class.java)
@@ -171,7 +171,7 @@ class TestGitImpl : GitImpl() {
     }
   }
 
-  private fun fatalResult() = GitCommandResult(false, 128, listOf("fatal: error: $UNKNOWN_ERROR_TEXT"), emptyList<String>())
+  private fun fatalResult() = GitCommandResult(false, 128, false, listOf("fatal: error: $UNKNOWN_ERROR_TEXT"), emptyList<String>())
 }