From 44ea46dd40d2411dfc615c14db92786730d977be Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Sat, 9 Mar 2013 16:35:14 +0100 Subject: [PATCH] Use RawParseUtils.prevLF in RebaseCommand As noticed by Robin Rosenberg in review of I4eb87c850078ca187b38b81cc91c92afb1176945. Change-Id: If96d66b6c025ad8f2f47829c933f3c65ab6cbeef Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/api/RebaseCommand.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 a206a3bc2..911a4e629 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -1250,10 +1250,8 @@ private static String readFile(File directory, String fileName) throws IOException { byte[] content = IO.readFully(new File(directory, fileName)); // strip off the last LF - int end = content.length; - while (0 < end && content[end - 1] == '\n') - end--; - return RawParseUtils.decode(content, 0, end); + int end = RawParseUtils.prevLF(content, content.length); + return RawParseUtils.decode(content, 0, end + 1); } private static void createFile(File parentDir, String name,