Merge "BaseRepositoryBuilder should trim CR from .git symref"
This commit is contained in:
commit
9eda23e469
|
@ -109,7 +109,8 @@ private static File getSymRef(File workTree, File dotGit, FS fs)
|
||||||
|
|
||||||
int pathStart = 8;
|
int pathStart = 8;
|
||||||
int lineEnd = RawParseUtils.nextLF(content, pathStart);
|
int lineEnd = RawParseUtils.nextLF(content, pathStart);
|
||||||
if (content[lineEnd - 1] == '\n')
|
while (content[lineEnd - 1] == '\n' ||
|
||||||
|
(content[lineEnd - 1] == '\r' && SystemReader.getInstance().isWindows()))
|
||||||
lineEnd--;
|
lineEnd--;
|
||||||
if (lineEnd == pathStart)
|
if (lineEnd == pathStart)
|
||||||
throw new IOException(MessageFormat.format(
|
throw new IOException(MessageFormat.format(
|
||||||
|
|
Loading…
Reference in New Issue