motiejus
/
jgit
1
Fork 0
Code Releases Activity

ResolveMergerTest: Open Git in try-with-resource 

Change-Id: Ic378ec25c4a3ea4354ee643029f87e46b6449ed4
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
David Pursehouse 2016-02-05 17:31:11 +09:00
parent 3c4e7c08a7
commit 8074f50b58
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
View File

@ -88,7 +88,7 @@ public void failingDeleteOfDirectoryWithUntrackedContent(
file = new File(folder1, "file2.txt");
write(file, "folder1--file2.txt");
Git git = new Git(db);
try (Git git = new Git(db)) {
git.add().addFilepattern(folder1.getName()).call();
RevCommit base = git.commit().setMessage("adding folder").call();
@ -118,6 +118,7 @@ public void failingDeleteOfDirectoryWithUntrackedContent(
assertTrue(ok);
assertTrue(file.exists());
}
}
/**
* Merging two conflicting subtrees when the index does not contain any file