Use local variable in RepositoryTestCase.indexState

There is a signature of the test helper method `indexState`,
in `RepositoryTestCase`, that accepts a `Repository` object
as an argument.  However, there was one line of code where
this variable was not being used, and the method was instead
referring to a member variable `db`.  I believe this was
probably just an oversight in a previous refactor, and
that the correct behavior is to use the variable from
the argument list.  This change also has the benefit
of making it possible to convert this method to a static
method, since it no longer relies on any state from the class.

Bug: 436200
Change-Id: Iac95b046dc5bd0b3756642e241c3637f1fad3609
Signed-off-by: Chris Price <chris@puppetlabs.com>

diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
index 83148d0009e10c78fceb2036e6c3b22c5b111a92..f9eb7b4eacf19a8faddd523b8254de1220d160da 100644 (file)
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
@@ -238,7 +238,7 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase {
                                sb.append(", sha1:" + ObjectId.toString(entry.getObjectId()));
                        if (0 != (includedOptions & CONTENT)) {
                                sb.append(", content:"
-                                               + new String(db.open(entry.getObjectId(),
+                                               + new String(repo.open(entry.getObjectId(),
                                                                Constants.OBJ_BLOB).getCachedBytes(), "UTF-8"));
                        }
                        if (0 != (includedOptions & ASSUME_UNCHANGED))