Browse Source

Merge changes I4f73487b,I1d1ed122

* changes:
  The Git API's only likes /, not \ in paths
  Skip a test that cannot be verified on Windows
stable-2.1
Matthias Sohn 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
812796023c
  1. 2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java
  2. 2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java

@ -256,6 +256,8 @@ public class CommitAndLogCommandTests extends RepositoryTestCase {
@Test
public void testModeChange() throws IOException, GitAPIException {
if (System.getProperty("os.name").startsWith("Windows"))
return; // SKIP
Git git = new Git(db);
// create file

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java

@ -425,7 +425,7 @@ public class StashApplyCommandTest extends RepositoryTestCase {
public void stashChangeInANewSubdirectory() throws Exception {
String subdir = "subdir";
String fname = "file2.txt";
String path = subdir + System.getProperty("file.separator") + fname;
String path = subdir + "/" + fname;
String otherBranch = "otherbranch";
writeTrashFile(subdir, fname, "content2");

Loading…
Cancel
Save