From ae7ee6c20d6175d46ebb69f6b9b601ce209819fa Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Fri, 15 May 2020 12:58:33 +0300
Subject: [PATCH] git: remove deprecated field

GitOrigin-RevId: 6e7c6a5d68971aa4f6a0a3641cda5f75d69e7275
---
 .../git4idea/src/git4idea/commands/GitHandler.java    | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitHandler.java b/plugins/git4idea/src/git4idea/commands/GitHandler.java
index c4f52ef62beb..13380d9e8a31 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHandler.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHandler.java
@@ -21,7 +21,6 @@ import com.intellij.util.EventDispatcher;
 import com.intellij.util.ThrowableConsumer;
 import com.intellij.vcs.VcsLocaleHelper;
 import com.intellij.vcsUtil.VcsFileUtil;
-import git4idea.GitVcs;
 import git4idea.config.GitExecutableManager;
 import git4idea.config.GitVersionSpecialty;
 import org.jetbrains.annotations.NonNls;
@@ -84,8 +83,6 @@ public abstract class GitHandler {
          GitExecutableManager.getInstance().getPathToGit(project),
          command,
          configParameters);
-    myProgressParameterAllowed =
-      GitVersionSpecialty.ABLE_TO_USE_PROGRESS_IN_REMOTE_COMMANDS.existsIn(project);
   }
 
   /**
@@ -117,7 +114,6 @@ public abstract class GitHandler {
                        @NotNull GitCommand command,
                        @NotNull List<String> configParameters) {
     myProject = project;
-    myVcs = project != null ? GitVcs.getInstance(project) : null;
     myPathToExecutable = pathToExecutable;
     myCommand = command;
 
@@ -464,9 +460,6 @@ public abstract class GitHandler {
   }
 
   //region deprecated stuff
-  //Used by Gitflow in GitInitLineHandler.onTextAvailable
-  @Deprecated
-  protected final GitVcs myVcs;
   @Deprecated
   private Integer myExitCode; // exit code or null if exit code is not yet available
   @Deprecated
@@ -474,8 +467,6 @@ public abstract class GitHandler {
   @Deprecated
   private static final int LAST_OUTPUT_SIZE = 5;
   @Deprecated
-  private boolean myProgressParameterAllowed = false;
-  @Deprecated
   private final List<VcsException> myErrors = Collections.synchronizedList(new ArrayList<>());
 
   /**
@@ -486,7 +477,7 @@ public abstract class GitHandler {
    */
   @Deprecated
   public boolean addProgressParameter() {
-    if (myProgressParameterAllowed) {
+    if (myProject != null && GitVersionSpecialty.ABLE_TO_USE_PROGRESS_IN_REMOTE_COMMANDS.existsIn(myProject)) {
       addParameters("--progress");
       return true;
     }