diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-08 15:09:46 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-08 23:39:23 +0200 |
| commit | 8f7e8513463487cfbcd41e40a684abec9ec10778 (patch) | |
| tree | 2a0b9817aeab3f144d2f4c9954c54071fed54f97 /org.eclipse.jgit.junit/src/org/eclipse/jgit | |
| parent | 2f8911181b1d678e2e54b0863dd454e27f395cb3 (diff) | |
| download | jgit-8f7e8513463487cfbcd41e40a684abec9ec10778.tar.gz jgit-8f7e8513463487cfbcd41e40a684abec9ec10778.zip | |
[error prone] suppress AmbiguousMethodReference in AnyObjectId
Move the implementation of the static equals() method to a new method
and suppress the error. Deprecate the old method to signal that we
intend to remove it in the next major release.
See https://errorprone.info/bugpattern/AmbiguousMethodReference
Change-Id: I5e29c97f4db3e11770be589a6ccd785e2c9ac7f2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit/src/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index af4cc1cb9b..e89cf0fb83 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -728,7 +728,7 @@ public class TestRepository<R extends Repository> implements AutoCloseable { ThreeWayMerger merger = MergeStrategy.RECURSIVE.newMerger(db, true); merger.setBase(parent.getTree()); if (merger.merge(head, commit)) { - if (AnyObjectId.equals(head.getTree(), merger.getResultTreeId())) + if (AnyObjectId.isEqual(head.getTree(), merger.getResultTreeId())) return null; tick(1); org.eclipse.jgit.lib.CommitBuilder b = |