Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Hohenegger2015-12-28 14:15:35 +0000
committerMatthias Sohn2015-12-30 09:21:43 +0000
commita612318d4170c0d6008fb9a71f5d637eda5d68da (patch)
tree70d27603847c6fd6d5c1a21c64a26ac8a1c453d2
parentf3c1041838e8e38ac1678f16e73476945bbedcd5 (diff)
downloadegit-a612318d4170c0d6008fb9a71f5d637eda5d68da.tar.gz
egit-a612318d4170c0d6008fb9a71f5d637eda5d68da.tar.xz
egit-a612318d4170c0d6008fb9a71f5d637eda5d68da.zip
Fixed warnings "Deprecated": Use Repository#exactRef(..) or findRef(..)
Change-Id: I9441aa6d4aadf56055eafb4f82ddc4916d3b62d5 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/GitFlowRepositoryTest.java2
-rw-r--r--org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/AbstractGitFlowOperationTest.java2
-rw-r--r--org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/InitOperationTest.java2
-rw-r--r--org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java2
-rw-r--r--org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java4
-rw-r--r--org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureRebaseOperation.java2
-rw-r--r--org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java2
7 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/GitFlowRepositoryTest.java b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/GitFlowRepositoryTest.java
index d456ae3046..aacd37c104 100644
--- a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/GitFlowRepositoryTest.java
+++ b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/GitFlowRepositoryTest.java
@@ -134,7 +134,7 @@ public class GitFlowRepositoryTest extends AbstractDualRepositoryTestCase {
new FeatureStartOperation(gfRepo, MY_FEATURE).execute(null);
- Ref actualFeatureRef = repository.getRef(R_HEADS
+ Ref actualFeatureRef = repository.exactRef(R_HEADS
+ gfRepo.getConfig().getFeaturePrefix() + MY_FEATURE);
assertEquals(MY_FEATURE, gfRepo.getFeatureBranchName(actualFeatureRef));
}
diff --git a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/AbstractGitFlowOperationTest.java b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/AbstractGitFlowOperationTest.java
index 1a964b974e..b810c2ec6a 100644
--- a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/AbstractGitFlowOperationTest.java
+++ b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/AbstractGitFlowOperationTest.java
@@ -60,7 +60,7 @@ abstract public class AbstractGitFlowOperationTest extends GitTestCase {
protected Ref findBranch(Repository repository, String branchName)
throws IOException {
- return repository.getRef(R_HEADS + branchName);
+ return repository.exactRef(R_HEADS + branchName);
}
protected RevCommit parseCommit(Repository repo, AnyObjectId id)
diff --git a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/InitOperationTest.java b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/InitOperationTest.java
index 6f16732c63..feb630ef06 100644
--- a/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/InitOperationTest.java
+++ b/org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/InitOperationTest.java
@@ -67,7 +67,7 @@ public class InitOperationTest extends AbstractGitFlowOperationTest {
.createInitialCommit("testInitLocalMasterMissing\n\nfirst commit\n");
Repository repository = testRepository.getRepository();
- new RenameBranchOperation(repository, repository.getRef(repository
+ new RenameBranchOperation(repository, repository.findRef(repository
.getBranch()), "foobar").execute(null);
new InitOperation(repository).execute(null);
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java
index d527e92c1c..150b979ff7 100644
--- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java
+++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java
@@ -287,7 +287,7 @@ public class InitDialog extends TitleAreaDialog {
private boolean isMasterBranchAvailable(String master, Repository repository) {
try {
- return repository.getRef(R_HEADS + master) != null;
+ return repository.exactRef(R_HEADS + master) != null;
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java
index eaf6ada3e7..1f0edffebd 100644
--- a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java
+++ b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java
@@ -85,7 +85,7 @@ public class GitFlowRepository {
* @throws IOException
*/
public Ref findBranch(String branchName) throws IOException {
- return repository.getRef(R_HEADS + branchName);
+ return repository.exactRef(R_HEADS + branchName);
}
/**
@@ -257,7 +257,7 @@ public class GitFlowRepository {
throws MissingObjectException, IncorrectObjectTypeException,
IOException {
try (RevWalk revWalk = new RevWalk(repository)) {
- Ref tagRef = repository.getRef(R_TAGS + tagName);
+ Ref tagRef = repository.exactRef(R_TAGS + tagName);
if (tagRef == null) {
return null;
}
diff --git a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureRebaseOperation.java b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureRebaseOperation.java
index 48b09d0837..b73754fd1d 100644
--- a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureRebaseOperation.java
+++ b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureRebaseOperation.java
@@ -45,7 +45,7 @@ public final class FeatureRebaseOperation extends GitFlowOperation {
}
Repository jgitRepo = repository.getRepository();
- Ref develop = jgitRepo.getRef(repository.getConfig().getDevelopFull());
+ Ref develop = jgitRepo.exactRef(repository.getConfig().getDevelopFull());
RebaseOperation op = new RebaseOperation(jgitRepo, develop);
op.execute(null);
diff --git a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java
index 5f1b472ec6..71ea642c29 100644
--- a/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java
+++ b/org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java
@@ -168,7 +168,7 @@ public final class InitOperation extends GitFlowOperation {
private boolean isMasterBranchAvailable() throws CoreException {
try {
- return repository.getRepository().getRef(R_HEADS + master) != null;
+ return repository.getRepository().exactRef(R_HEADS + master) != null;
} catch (IOException e) {
throw new CoreException(error(e.getMessage(), e));
}

Back to the top