diff options
| author | Shawn Pearce <spearce@spearce.org> | 2011-11-04 18:09:56 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-11-04 18:09:56 -0400 |
| commit | 00235c77d6e636aac5896f0b1e76b1e43e84410f (patch) | |
| tree | 8b9aac9ab7b7cc81435c6fed1107f699b02ea82a /org.eclipse.jgit/src | |
| parent | 2f2c0188196be96cb52e753c0ffac78e27fdaaff (diff) | |
| parent | 3ceb4fac23fe175fb0ef51977bdb67847986f992 (diff) | |
| download | jgit-00235c77d6e636aac5896f0b1e76b1e43e84410f.tar.gz jgit-00235c77d6e636aac5896f0b1e76b1e43e84410f.zip | |
Merge "Do not resolve path using cygwin unless told to"
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); } |