MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Simplify packed-refs line parsing a bit.

Browse Source
This commit is contained in:
Kirill Likhodedov
2014-04-15 19:58:07 +04:00
parent bf5c358fa1
commit ab4aada472
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/repo/GitRepositoryReader.java
+14 -7
View File
@@ -427,7 +427,10 @@ class GitRepositoryReader {
@Nullable
private static HashAndName parsePackedRefsLine(@NotNull String line) {
line = line.trim();
char firstChar = line.isEmpty() ? 0 : line.charAt(0);
if (line.isEmpty()) {
return null;
}
char firstChar = line.charAt(0);
if (firstChar == '#') { // ignoring comments
return null;
}
@@ -444,9 +447,14 @@ class GitRepositoryReader {
break;
}
}
if (hash == null) {
LOG.warn("Ignoring invalid packed-refs line: [" + line + "]");
return null;
}
String branch = null;
int start = i;
if (hash != null && start < line.length() && line.charAt(start++) == ' ') {
if (start < line.length() && line.charAt(start++) == ' ') {
for (i = start; i < line.length(); i++) {
char c = line.charAt(i);
if (Character.isWhitespace(c)) {
@@ -456,12 +464,11 @@ class GitRepositoryReader {
branch = line.substring(start, i);
}
if (hash != null && branch != null) {
return new HashAndName(shortBuffer(hash.trim()), shortBuffer(branch));
if (branch == null) {
LOG.warn("Ignoring invalid packed-refs line: [" + line + "]");
return null;
}
LOG.info("Ignoring invalid packed-refs line: [" + line + "]");
return null;
return new HashAndName(shortBuffer(hash.trim()), shortBuffer(branch));
}
@NotNull