diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2015-02-27 01:54:12 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2015-02-27 01:54:12 +0100 |
| commit | 1350f7ea1d801b8e47f8c58779967b8e31881883 (patch) | |
| tree | a7896bb744cbdcece4801d30745e742672efba33 /org.eclipse.jgit.http.test | |
| parent | 102c50e177f398247452a68c7142dc1cf97532f1 (diff) | |
| parent | 9b486e390625df6cb495f57012a0384753399ec8 (diff) | |
| download | jgit-1350f7ea1d801b8e47f8c58779967b8e31881883.tar.gz jgit-1350f7ea1d801b8e47f8c58779967b8e31881883.zip | |
Merge branch 'stable-3.7'
* stable-3.7:
Prepare 3.7.1-SNAPSHOT builds
JGit v3.7.0.201502260915-r
Read user.name and email from environment first
Provide more details in exceptions thrown when packfile is invalid
Change-Id: I427f861c6bc94da5e3e05dbbebbf0ad15719a323
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.http.test')
| -rw-r--r-- | org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java index 2823b34b1f..68c5a3a439 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java @@ -162,7 +162,7 @@ public class ProtocolErrorTest extends HttpTestCase { try { PacketLineIn pckin = new PacketLineIn(rawin); assertEquals("unpack error " - + JGitText.get().packfileIsTruncated, + + JGitText.get().packfileIsTruncatedNoParam, pckin.readString()); assertEquals("ng refs/objects/A n/a (unpacker error)", pckin.readString()); |