diff options
| author | Shawn Pearce <sop@google.com> | 2012-12-04 10:00:30 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-12-04 10:00:30 -0500 |
| commit | e9a1df6c5635220f7c44e582d7370b92a164c9cd (patch) | |
| tree | 2785d456fa365c059ba16a0c7835c3364d9e7206 | |
| parent | b9e485661dd0ecad67585ed0e24cb0ab025085a7 (diff) | |
| parent | 257f3fe4a1b9e450b2f665b5f0ed09a3ab3839b9 (diff) | |
| download | jgit-e9a1df6c5635220f7c44e582d7370b92a164c9cd.tar.gz jgit-e9a1df6c5635220f7c44e582d7370b92a164c9cd.zip | |
Merge "Commit message may not necessarily be in UTF-8"
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 4 |
1 files changed, 2 insertions, 2 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 3f99057f9f..2cf759c5ff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -278,8 +278,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> { sb.append(" "); sb.append(step.commit.name()); sb.append(" "); - sb.append(new String(step.shortMessage, - Constants.CHARACTER_ENCODING).trim()); + sb.append(RawParseUtils.decode(step.shortMessage) + .trim()); fw.write(sb.toString()); fw.newLine(); } |