[git] cleanup: move LOG to the companion object

GitOrigin-RevId: cbc3161972bfa71b96ad2342b87528969d13028f
JetBrains · Nov 11, 2020 · 37327cc · 37327cc
1 parent e5d69ee
commit 37327cc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
@@ -63,14 +63,13 @@ class GitApplyChangesProcess(private val project: Project,
                              private val defaultCommitMessageGenerator: (GitRepository, VcsFullCommitDetails) -> @NonNls String,
                              private val preserveCommitMetadata: Boolean,
                              private val cleanupBeforeCommit: (GitRepository) -> Unit = {}) {
-  private val LOG = logger<GitApplyChangesProcess>()
   private val repositoryManager = GitRepositoryManager.getInstance(project)
   private val vcsNotifier = VcsNotifier.getInstance(project)
   private val changeListManager = ChangeListManagerEx.getInstanceEx(project)
   private val vcsHelper = AbstractVcsHelper.getInstance(project)
 
   fun execute() {
-    val commitsInRoots = DvcsUtil.groupCommitsByRoots<GitRepository>(repositoryManager, commits)
+    val commitsInRoots = DvcsUtil.groupCommitsByRoots(repositoryManager, commits)
     LOG.info("${operationName}ing commits: " + toString(commitsInRoots))
 
     val successfulCommits = mutableListOf<VcsFullCommitDetails>()
@@ -409,6 +408,7 @@ class GitApplyChangesProcess(private val project: Project,
   }
 
   companion object {
+    private val LOG = logger<GitApplyChangesProcess>()
     private const val RESOLVE = "resolve"
   }
 }