diff options
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java index e5e97c5fb9..ee83c65f8b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java +++ b/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); } |