RefDatabase#getReflogReader(String): use #exactRef to resolve refName

Don't accept short ref names anymore which is more predictable.

Change-Id: I5e7323c610c68b25facd6f2286456716d8e6cf1a

6 files changed, 21 insertions, 17 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java
index a9bd126ff3..3f5c5da55a 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java
@@ -534,7 +534,7 @@ public class CherryPickCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("cherry-pick: "));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("cherry-pick: "));
 		}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
index f70ada4e30..f5fd73ba38 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
@@ -182,7 +182,7 @@ public class CloneCommandTest extends RepositoryTestCase {
 
 	private static boolean hasRefLog(Repository repo, Ref ref) {
 		try {
-			return repo.getRefDatabase().getReflogReader(ref.getName())
+			return repo.getRefDatabase().getReflogReader(ref)
 					.getLastEntry() != null;
 		} catch (IOException ioe) {
 			throw new IllegalStateException(ioe);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java
index ced24b5928..4e5f44e5a6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java
@@ -74,7 +74,7 @@ public class CommitAndLogCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(
 					reader.getLastEntry().getComment().startsWith("commit:"));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(
 					reader.getLastEntry().getComment().startsWith("commit:"));
 		}
@@ -254,7 +254,7 @@ public class CommitAndLogCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("commit (amend):"));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("commit (amend):"));
 		}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
index d40df26690..21cfcc4e34 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
@@ -439,7 +439,7 @@ public class CommitCommandTest extends RepositoryTestCase {
 					db.getRefDatabase().getReflogReader(Constants.HEAD)
 							.getLastEntry().getComment());
 			assertEquals("commit: Squashed commit of the following:",
-					db.getRefDatabase().getReflogReader(db.getBranch())
+					db.getRefDatabase().getReflogReader(db.getFullBranch())
 							.getLastEntry().getComment());
 		}
 	}
@@ -464,7 +464,7 @@ public class CommitCommandTest extends RepositoryTestCase {
 					db.getRefDatabase().getReflogReader(Constants.HEAD)
 							.getReverseEntries()));
 			assertEquals("testRl;commit (initial): c1;", reflogComments(
-					db.getRefDatabase().getReflogReader(db.getBranch())
+					db.getRefDatabase().getReflogReader(db.getFullBranch())
 							.getReverseEntries()));
 		}
 	}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
index ba13f8ac1f..503fef9916 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
@@ -81,7 +81,8 @@ public class MergeCommandTest extends RepositoryTestCase {
 		assertEquals("commit (initial): initial commit", refDb
 				.getReflogReader(Constants.HEAD).getLastEntry().getComment());
 		assertEquals("commit (initial): initial commit", refDb
-				.getReflogReader(db.getBranch()).getLastEntry().getComment());
+				.getReflogReader(db.getFullBranch()).getLastEntry()
+				.getComment());
 	}
 
 	@Test
@@ -99,7 +100,8 @@ public class MergeCommandTest extends RepositoryTestCase {
 		assertEquals("commit: second commit", db.getRefDatabase()
 				.getReflogReader(Constants.HEAD).getLastEntry().getComment());
 		assertEquals("commit: second commit", db.getRefDatabase()
-				.getReflogReader(db.getBranch()).getLastEntry().getComment());
+				.getReflogReader(db.getFullBranch()).getLastEntry()
+				.getComment());
 	}
 
 	@Test
@@ -122,7 +124,7 @@ public class MergeCommandTest extends RepositoryTestCase {
 				refDb.getReflogReader(Constants.HEAD)
 						.getLastEntry().getComment());
 		assertEquals("merge refs/heads/master: Fast-forward",
-				refDb.getReflogReader(db.getBranch())
+				refDb.getReflogReader(db.getFullBranch())
 						.getLastEntry().getComment());
 	}
 
@@ -147,7 +149,8 @@ public class MergeCommandTest extends RepositoryTestCase {
 		assertEquals("merge refs/heads/master: Fast-forward", refDb
 				.getReflogReader(Constants.HEAD).getLastEntry().getComment());
 		assertEquals("merge refs/heads/master: Fast-forward", refDb
-				.getReflogReader(db.getBranch()).getLastEntry().getComment());
+				.getReflogReader(db.getFullBranch()).getLastEntry()
+				.getComment());
 	}
 
 	@Test
@@ -179,7 +182,8 @@ public class MergeCommandTest extends RepositoryTestCase {
 		assertEquals("merge refs/heads/master: Fast-forward", refDb
 				.getReflogReader(Constants.HEAD).getLastEntry().getComment());
 		assertEquals("merge refs/heads/master: Fast-forward", refDb
-				.getReflogReader(db.getBranch()).getLastEntry().getComment());
+				.getReflogReader(db.getFullBranch()).getLastEntry()
+				.getComment());
 	}
 
 	@Test
@@ -243,7 +247,7 @@ public class MergeCommandTest extends RepositoryTestCase {
 		assertEquals(
 				"merge refs/heads/master: Merge made by "
 						+ mergeStrategy.getName() + ".",
-				refDb.getReflogReader(db.getBranch()).getLastEntry()
+				refDb.getReflogReader(db.getFullBranch()).getLastEntry()
 						.getComment());
 	}
 
@@ -679,7 +683,7 @@ public class MergeCommandTest extends RepositoryTestCase {
 			assertEquals(
 					"merge " + secondCommit.getId().getName()
 							+ ": Merge made by resolve.",
-					refDb.getReflogReader(db.getBranch()).getLastEntry()
+					refDb.getReflogReader(db.getFullBranch()).getLastEntry()
 							.getComment());
 		}
 	}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
index e4d0eb76f7..89fdb32220 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
@@ -92,7 +92,7 @@ public class RevertCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
 		}
@@ -176,7 +176,7 @@ public class RevertCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
 		}
@@ -230,7 +230,7 @@ public class RevertCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(reader.getLastEntry().getComment()
 					.startsWith("revert: Revert \""));
 		}
@@ -439,7 +439,7 @@ public class RevertCommandTest extends RepositoryTestCase {
 			ReflogReader reader = refDb.getReflogReader(Constants.HEAD);
 			assertTrue(
 					reader.getLastEntry().getComment().startsWith("revert: "));
-			reader = refDb.getReflogReader(db.getBranch());
+			reader = refDb.getReflogReader(db.getFullBranch());
 			assertTrue(
 					reader.getLastEntry().getComment().startsWith("revert: "));
 		}