diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-09-25 00:51:20 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-09-25 18:46:41 +0200 |
| commit | 2531d939e42f706cb061c7bc0a0fd1c7574958c2 (patch) | |
| tree | 0932ec0f8cf05843752542d281acb998e2ac00c4 | |
| parent | 78c865942849de420592bb822e9e1fd85cc95ade (diff) | |
| download | jgit-2531d939e42f706cb061c7bc0a0fd1c7574958c2.tar.gz jgit-2531d939e42f706cb061c7bc0a0fd1c7574958c2.zip | |
Add the intended file to avoid breakage
This case breaks when the default is to disallow empty commits.
Change-Id: Ibc223092eefe9f4b21374717dee5a9399bf890f9
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 |