motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "BaseRepositoryBuilder should trim CR from .git symref"

This commit is contained in:
Shawn Pearce 2015-12-15 23:18:13 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 8b749f7de5 82edf06311
commit 9eda23e469
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
View File

@ -109,7 +109,8 @@ private static File getSymRef(File workTree, File dotGit, FS fs)
int pathStart = 8;
int lineEnd = RawParseUtils.nextLF(content, pathStart);
if (content[lineEnd - 1] == '\n')
while (content[lineEnd - 1] == '\n' ||
(content[lineEnd - 1] == '\r' && SystemReader.getInstance().isWindows()))
lineEnd--;
if (lineEnd == pathStart)
throw new IOException(MessageFormat.format(