diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-08-07 16:49:45 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-08-07 16:49:45 +0200 |
| commit | 993fcac2d34f113977c1ad7e0f83a2cc0f903f71 (patch) | |
| tree | f8e79bb05ef0b864cdc30101b52a90d66c9a4696 /org.eclipse.jgit.test | |
| parent | 7c1e175de8ca26b572816204c7ac7bb9ce49678f (diff) | |
| download | jgit-993fcac2d34f113977c1ad7e0f83a2cc0f903f71.tar.gz jgit-993fcac2d34f113977c1ad7e0f83a2cc0f903f71.zip | |
Allow JGit to read C Git rebase state
C Git prefixes the time stamp in the author script with a "@"
Change-Id: I140b29519acc101da78296eef562368fc6b61135
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 4a7a45e8f7..edb36b81fe 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -975,7 +975,7 @@ public class RebaseCommandTest extends RepositoryTestCase { String[] lines = convertedAuthor.split("\n"); assertEquals("GIT_AUTHOR_NAME='Author name'", lines[0]); assertEquals("GIT_AUTHOR_EMAIL='a.mail@some.com'", lines[1]); - assertEquals("GIT_AUTHOR_DATE='123456789 -0100'", lines[2]); + assertEquals("GIT_AUTHOR_DATE='@123456789 -0100'", lines[2]); PersonIdent parsedIdent = git.rebase().parseAuthor( convertedAuthor.getBytes("UTF-8")); @@ -992,7 +992,7 @@ public class RebaseCommandTest extends RepositoryTestCase { lines = convertedAuthor.split("\n"); assertEquals("GIT_AUTHOR_NAME='Author name'", lines[0]); assertEquals("GIT_AUTHOR_EMAIL='a.mail@some.com'", lines[1]); - assertEquals("GIT_AUTHOR_DATE='123456789 +0930'", lines[2]); + assertEquals("GIT_AUTHOR_DATE='@123456789 +0930'", lines[2]); parsedIdent = git.rebase().parseAuthor( convertedAuthor.getBytes("UTF-8")); |