IDEA-89881 git push to an alternative branch pushed to the tracked branch instead

Merge remote-tracking branch 'idea_release/fix_for_11.1'

Conflicts:
	plugins/git4idea/src/git4idea/push/GitPushDialog.java

diff --cc plugins/git4idea/src/git4idea/push/GitPushDialog.java
index c4172595676b588c3cec2e04eed2b14ae2108876,8d665304b9382dbb614140ba79ca9c114a10d250..53fd94158637463cd4008f31c6b8acd8cf9ec475
--- 1/plugins/git4idea/src/git4idea/push/GitPushDialog.java
--- 2/plugins/git4idea/src/git4idea/push/GitPushDialog.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
@@@ -225,8 -211,8 +226,8 @@@ public class GitPushDialog extends Dial
        String remoteName = currentBranch.getTrackedRemoteName(repository.getProject(), repository.getRoot());
        String trackedBranchName = currentBranch.getTrackedBranchName(repository.getProject(), repository.getRoot());
        GitRemote remote = GitUtil.findRemoteByName(repository, remoteName);
-       GitBranch tracked = GitBranchUtil.findRemoteBranchByName(repository, remote, trackedBranchName);
-       if (remote == null || tracked == null) {
 -      GitBranch targetBranch = findRemoteBranchByName(repository, remote, trackedBranchName);
++      GitBranch targetBranch = GitBranchUtil.findRemoteBranchByName(repository, remote, trackedBranchName);
+       if (remote == null || targetBranch == null) {
          Pair<GitRemote,GitBranch> remoteAndBranch = GitUtil.findMatchingRemoteBranch(repository, currentBranch);
          if (remoteAndBranch == null) {
            remote = myRefspecPanel.getSelectedRemote();