Browse Source

Merge "Fix NPE on reading global config on MAC" into stable-0.11

stable-0.11
Chris Aniszczyk 14 years ago committed by Code Review
parent
commit
b46e06bc74
  1. 7
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java

7
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java

@ -66,7 +66,12 @@ abstract class FS_POSIX extends FS {
String w = readPipe(userHome(), //
new String[] { "bash", "--login", "-c", "which git" }, //
Charset.defaultCharset().name());
return new File(w).getParentFile().getParentFile();
if (w == null || w.length() == 0)
return null;
File parentFile = new File(w).getParentFile();
if (parentFile == null)
return null;
return parentFile.getParentFile();
}
return null;

Loading…
Cancel
Save