From 2531d939e42f706cb061c7bc0a0fd1c7574958c2 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 25 Sep 2012 00:51:20 +0200 Subject: [PATCH] Add the intended file to avoid breakage This case breaks when the default is to disallow empty commits. Change-Id: Ibc223092eefe9f4b21374717dee5a9399bf890f9 --- .../tst/org/eclipse/jgit/merge/ResolveMergerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java index 30e046ea51..63c63eaa27 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java @@ -89,7 +89,7 @@ public class ResolveMergerTest extends RepositoryTestCase { file = new File(db.getWorkTree(), "unrelated.txt"); write(file, "unrelated"); - git.add().addFilepattern("unrelated").call(); + git.add().addFilepattern("unrelated.txt").call(); RevCommit head = git.commit().setMessage("Adding another file").call(); // Untracked file to cause failing path for delete() of folder1 -- 2.39.5