summaryrefslogtreecommitdiff
path: root/plugins/git4idea/src/git4idea/push/GitPusher.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/git4idea/src/git4idea/push/GitPusher.java')
-rw-r--r--plugins/git4idea/src/git4idea/push/GitPusher.java20
1 files changed, 2 insertions, 18 deletions
diff --git a/plugins/git4idea/src/git4idea/push/GitPusher.java b/plugins/git4idea/src/git4idea/push/GitPusher.java
index 778d2dcd0033..1dfcdfaf327d 100644
--- a/plugins/git4idea/src/git4idea/push/GitPusher.java
+++ b/plugins/git4idea/src/git4idea/push/GitPusher.java
@@ -256,7 +256,7 @@ public final class GitPusher {
@NotNull GitCommitsByRepoAndBranch commits,
@NotNull GitRepository repository) {
GitPushSpec pushSpec = pushInfo.getPushSpecs().get(repository);
- GitSimplePushResult simplePushResult = pushAndGetSimpleResult(repository, pushSpec, commits.get(repository));
+ GitSimplePushResult simplePushResult = pushAndGetSimpleResult(repository, pushSpec);
String output = simplePushResult.getOutput();
switch (simplePushResult.getType()) {
case SUCCESS:
@@ -306,8 +306,7 @@ public final class GitPusher {
}
@NotNull
- private GitSimplePushResult pushAndGetSimpleResult(@NotNull GitRepository repository,
- @NotNull GitPushSpec pushSpec, @NotNull GitCommitsByBranch commitsByBranch) {
+ private GitSimplePushResult pushAndGetSimpleResult(@NotNull GitRepository repository, @NotNull GitPushSpec pushSpec) {
if (pushSpec.getDest() == NO_TARGET_BRANCH) {
return GitSimplePushResult.notPushed();
}
@@ -367,21 +366,6 @@ public final class GitPusher {
}
@NotNull
- private static String formPushSpec(@NotNull GitPushSpec spec, @NotNull GitRemote remote) {
- String destWithRemote = spec.getDest().getName();
- String prefix = remote.getName() + "/";
- String destName;
- if (destWithRemote.startsWith(prefix)) {
- destName = destWithRemote.substring(prefix.length());
- }
- else {
- LOG.error("Destination remote branch has invalid name. Remote branch name: " + destWithRemote + "\nRemote: " + remote);
- destName = destWithRemote;
- }
- return spec.getSource().getName() + ":" + destName;
- }
-
- @NotNull
private GitSimplePushResult pushNatively(GitRepository repository, GitPushSpec pushSpec, @NotNull String url) {
GitPushRejectedDetector rejectedDetector = new GitPushRejectedDetector();
GitLineHandlerListener progressListener = GitStandardProgressAnalyzer.createListener(myProgressIndicator);