MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix GithubRebase action to use new Git API

Browse Source
This commit is contained in:
Oleg Shpynov
2011-10-25 17:03:25 +04:00
parent 0fc745e7ca
commit 756f0ed3f5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/src/org/jetbrains/plugins/github/GithubRebaseAction.java
+5 -4
View File
@@ -132,10 +132,11 @@ public class GithubRebaseAction extends DumbAwareAction {
// Check that corresponding remote branch is configured for the fork origin repo
final Ref<String> remoteForForkParentRepo = new Ref<String>();
for (GitRemote gitRemote : gitRepository.getRemotes()) {
final String fetchUrl = gitRemote.getFetchRefSpec();
if (fetchUrl.endsWith(parent + ".git")) {
remoteForForkParentRepo.set(gitRemote.getName());
break;
for (String url : gitRemote.getUrls()) {
if (url.endsWith(parent + ".git")) {
remoteForForkParentRepo.set(gitRemote.getName());
break;
}
}
}
if (remoteForForkParentRepo.isNull()){