Browse Source

Allow detection of case insensitive file systems

Change-Id: I03f59d07bcc3338ef8d392cbd940799186ca03bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
stable-2.1
Matthias Sohn 13 years ago committed by Robin Rosenberg
parent
commit
e9c811d0d0
  1. 10
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
  2. 10
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
  3. 7
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
  4. 8
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
  5. 6
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java

@ -631,6 +631,11 @@ public class AddCommandTest extends RepositoryTestCase {
public boolean canExecute(File f) { public boolean canExecute(File f) {
return true; return true;
} }
@Override
public boolean isCaseSensitive() {
return false;
}
}; };
Git git = Git.open(db.getDirectory(), executableFs); Git git = Git.open(db.getDirectory(), executableFs);
@ -671,6 +676,11 @@ public class AddCommandTest extends RepositoryTestCase {
public boolean canExecute(File f) { public boolean canExecute(File f) {
return false; return false;
} }
@Override
public boolean isCaseSensitive() {
return false;
}
}; };
config = db.getConfig(); config = db.getConfig();

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java

@ -109,6 +109,11 @@ public class CommitCommandTest extends RepositoryTestCase {
public boolean canExecute(File f) { public boolean canExecute(File f) {
return true; return true;
} }
@Override
public boolean isCaseSensitive() {
return true;
}
}; };
Git git = Git.open(db.getDirectory(), executableFs); Git git = Git.open(db.getDirectory(), executableFs);
@ -149,6 +154,11 @@ public class CommitCommandTest extends RepositoryTestCase {
public boolean canExecute(File f) { public boolean canExecute(File f) {
return false; return false;
} }
@Override
public boolean isCaseSensitive() {
return true;
}
}; };
config = db.getConfig(); config = db.getConfig();

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

@ -135,6 +135,13 @@ public abstract class FS {
*/ */
public abstract boolean supportsExecute(); public abstract boolean supportsExecute();
/**
* Is this file system case sensitive
*
* @return true if this implementation is case sensitive
*/
public abstract boolean isCaseSensitive();
/** /**
* Determine if the file is executable (or not). * Determine if the file is executable (or not).
* <p> * <p>

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

@ -85,6 +85,14 @@ abstract class FS_POSIX extends FS {
super(src); super(src);
} }
@Override
public boolean isCaseSensitive() {
if (isMacOS())
return false;
else
return true;
}
@Override @Override
public ProcessBuilder runInShell(String cmd, String[] args) { public ProcessBuilder runInShell(String cmd, String[] args) {
List<String> argv = new ArrayList<String>(4 + args.length); List<String> argv = new ArrayList<String>(4 + args.length);

6
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java

@ -53,6 +53,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
class FS_Win32 extends FS { class FS_Win32 extends FS {
static boolean isWin32() { static boolean isWin32() {
final String osDotName = AccessController final String osDotName = AccessController
.doPrivileged(new PrivilegedAction<String>() { .doPrivileged(new PrivilegedAction<String>() {
@ -88,6 +89,11 @@ class FS_Win32 extends FS {
return false; return false;
} }
@Override
public boolean isCaseSensitive() {
return false;
}
@Override @Override
public boolean retryFailedLockFileCommit() { public boolean retryFailedLockFileCommit() {
return true; return true;

Loading…
Cancel
Save