diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2012-08-13 09:43:42 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-08-13 09:43:42 -0400 |
| commit | 02113f7411df6d680aa520803ac8c63009696c3a (patch) | |
| tree | 1c259ed237275c09592d889c37cdfcae3cf7d2a3 /org.eclipse.jgit/src/org/eclipse/jgit/api | |
| parent | 1e75941410e3a6e5a21f3155521e80f6f0a08a47 (diff) | |
| parent | 993fcac2d34f113977c1ad7e0f83a2cc0f903f71 (diff) | |
| download | jgit-02113f7411df6d680aa520803ac8c63009696c3a.tar.gz jgit-02113f7411df6d680aa520803ac8c63009696c3a.zip | |
Merge "Allow JGit to read C Git rebase state"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 6f0c3eb0f4..9f8aa7bfb2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -439,6 +439,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { // representation for date and timezone sb.append(GIT_AUTHOR_DATE); sb.append("='"); + sb.append("@"); // @ for time in seconds since 1970 String externalString = author.toExternalString(); sb .append(externalString.substring(externalString @@ -1013,7 +1014,13 @@ public class RebaseCommand extends GitCommand<RebaseResult> { String time = keyValueMap.get(GIT_AUTHOR_DATE); // the time is saved as <seconds since 1970> <timezone offset> - long when = Long.parseLong(time.substring(0, time.indexOf(' '))) * 1000; + int timeStart = 0; + if (time.startsWith("@")) + timeStart = 1; + else + timeStart = 0; + long when = Long + .parseLong(time.substring(timeStart, time.indexOf(' '))) * 1000; String tzOffsetString = time.substring(time.indexOf(' ') + 1); int multiplier = -1; if (tzOffsetString.charAt(0) == '+') |