Browse Source

Merge "Do not resolve path using cygwin unless told to"

stable-1.2
Shawn Pearce 13 years ago committed by Code Review
parent
commit
00235c77d6
  1. 13
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java

13
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java

@ -81,11 +81,14 @@ class FS_Win32_Cygwin extends FS_Win32 {
}
public File resolve(final File dir, final String pn) {
String w = readPipe(dir, //
new String[] { cygpath, "--windows", "--absolute", pn }, //
"UTF-8");
if (w != null)
return new File(w);
String useCygPath = System.getProperty("jgit.usecygpath");
if (useCygPath != null && useCygPath.equals("true")) {
String w = readPipe(dir, //
new String[] { cygpath, "--windows", "--absolute", pn }, //
"UTF-8");
if (w != null)
return new File(w);
}
return super.resolve(dir, pn);
}

Loading…
Cancel
Save