diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-06-01 16:09:40 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-06-01 16:10:11 +0200 |
| commit | dfb33e699cf41cf81f538d3f570141d001c1bdf5 (patch) | |
| tree | b5b62b1ec4fc847b18a647b39ea83559106467be /org.eclipse.jgit.test/tst/org/eclipse/jgit/api | |
| parent | 9720f9e2492be0da596fb7228590477243e4f529 (diff) | |
| parent | 525baa1213097aa8635d846ce024635b1f33931a (diff) | |
| download | jgit-dfb33e699cf41cf81f538d3f570141d001c1bdf5.tar.gz jgit-dfb33e699cf41cf81f538d3f570141d001c1bdf5.zip | |
Merge branch 'master' into stable-4.4
* master:
Fix javadoc errors and unused imports introduced by ddd0fe25
RepoCommand: record manifest shallow recommendation in .gitmodules
RepoCommand: record manifest groups as submodule labels
Remove the deprecated TestRepository.getClock() method
Replace use of deprecated method Repository.getRef()
[findBugs] Prevent potential NPE in
FileLfsRepository.getOutputStream()
Better report on client side if push failed due to too large object
[findBugs] Prevent potential NPE in CloneCommand.init()
RepoCommand: remove --record-remote-branches
RepoCommandTest: Improve assertion message for remote branch recording
Change-Id: I4fbce4f84925a933fcc9a48058ed6793f5821b97
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java index 725ebc0d23..a4a699ef22 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java @@ -596,7 +596,7 @@ public class ResetCommandTest extends RepositoryTestCase { * @throws IOException */ private void assertSameAsHead(Ref ref) throws IOException { - Ref headRef = db.getRef(Constants.HEAD); + Ref headRef = db.exactRef(Constants.HEAD); assertEquals(headRef.getName(), ref.getName()); assertEquals(headRef.getObjectId(), ref.getObjectId()); } |