Commit 8a3b0236 authored by Daniil Tsaryov's avatar Daniil Tsaryov Committed by intellij-monorepo-bot
Browse files

IDEA-251554 [git] Git Pull Dialog: do not remember last used branch

(cherry picked from commit 6ce97970b82b68a9dbfaf5e2fcfe8cedebb1f99f)

GitOrigin-RevId: 8eb99b1436944b3f9a9eca9a78eba3c6dec5ce35
parent 8d9575f5
Showing with 0 additions and 11 deletions
+0 -11
......@@ -8,7 +8,6 @@ import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.StoragePathMacros;
import git4idea.pull.GitPullOption;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.EnumSet;
import java.util.Set;
......@@ -44,12 +43,4 @@ public class GitPullSettings implements PersistentStateComponent<GitPullSettings
? EnumSet.copyOf(options)
: NO_OPTIONS;
}
public @Nullable String getBranch() {
return myState.BRANCH;
}
public void setBranch(@Nullable String branch) {
myState.BRANCH = branch;
}
}
......@@ -139,12 +139,10 @@ class GitPullDialog(private val project: Project,
fun isCommitAfterMerge() = GitPullOption.NO_COMMIT !in selectedOptions
private fun loadSettings() {
branchField.item = pullSettings.branch
selectedOptions += pullSettings.options
}
private fun saveSettings() {
pullSettings.branch = branchField.item
pullSettings.options = selectedOptions
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment