Signed-off-by: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>
---
This has nothing to do with the series, just trying to squeeze it in... The
quickdiff fixes works fine with our without this patch, but it seems reasonable.
.../src/org/spearce/jgit/lib/AnyObjectId.java | 4 ++--
.../src/org/spearce/jgit/revwalk/RevObject.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/AnyObjectId.java b/org.spearce.jgit/src/org/spearce/jgit/lib/AnyObjectId.java
index e2f70ca..2e3a43e 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/AnyObjectId.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/AnyObjectId.java
@@ -248,12 +248,12 @@ public int hashCode() {
* the other id to compare to. May be null.
* @return true only if both ObjectIds have identical bits.
*/
- public boolean equals(final ObjectId other) {
+ public boolean equals(final AnyObjectId other) {
return other != null ? equals(this, other) : false;
}
public boolean equals(final Object o) {
- return equals((ObjectId) o);
+ return equals((AnyObjectId) o);
}
/**
diff --git a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevObject.java b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevObject.java
index e8fb29f..1a13d0a 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevObject.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevObject.java
@@ -75,7 +75,7 @@ public final ObjectId getId() {
}
@Override
- public final boolean equals(final ObjectId o) {
+ public final boolean equals(final AnyObjectId o) {
return this == o;
}
--
1.6.2.1.345.g89fb
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
