motiejus
/
jgit
1
Fork 0
Code Releases Activity

SubmoduleDeinitTest fails on Windows 

Bug: 538068
Change-Id: I982e8b12936582e8e119f45d7a3bf4888d3e0e1a
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
This commit is contained in:
Andrey Loskutov 2018-08-19 20:53:31 +02:00
parent c23d024ea8
commit 5a95e7e74b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleDeinitTest.java
View File

@ -136,10 +136,12 @@ public void dirtySubmoduleBecauseNewCommit() throws Exception {
generator.next();
//want to create a commit inside the repo...
Repository submoduleLocalRepo = generator.getRepository();
JGitTestUtil.writeTrashFile(submoduleLocalRepo, "file.txt", "new data");
Git.wrap(submoduleLocalRepo).commit().setAll(true).setMessage("local commit").call();
try (Repository submoduleLocalRepo = generator.getRepository()) {
JGitTestUtil.writeTrashFile(submoduleLocalRepo, "file.txt",
"new data");
Git.wrap(submoduleLocalRepo).commit().setAll(true)
.setMessage("local commit").call();
}
SubmoduleDeinitResult result = runDeinit(new SubmoduleDeinitCommand(db).addPath("sub"));
assertEquals(path, result.getPath());
assertEquals(SubmoduleDeinitCommand.SubmoduleDeinitStatus.DIRTY, result.getStatus());

10
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleDeinitCommand.java
View File

@ -227,11 +227,11 @@ private SubmoduleDeinitStatus checkDirty(RevWalk revWalk, String path)
return SubmoduleDeinitStatus.DIRTY;
}
Repository submoduleRepo = w.getRepository();
Status status = Git.wrap(submoduleRepo).status().call();
return status.isClean() ? SubmoduleDeinitStatus.SUCCESS
: SubmoduleDeinitStatus.DIRTY;
try (Repository submoduleRepo = w.getRepository()) {
Status status = Git.wrap(submoduleRepo).status().call();
return status.isClean() ? SubmoduleDeinitStatus.SUCCESS
: SubmoduleDeinitStatus.DIRTY;
}
}
}