From de2455af678b5c9d0111336daed1ca0e0958ca01 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Sun, 28 Oct 2012 15:57:43 +0100 Subject: ResetCommand: Use DirCacheBuilder in resetIndex With bug 391855, DirCacheEditor's PathEdit will be applied for each stage. For an unmerged path, this would result in 3 equal entries for the same path. By using a DirCacheBuilder, the code is simpler and does not have the above problem with unmerged paths. Bug: 391860 Change-Id: I785deeaeb8474f8c7a7fbc9ef00d3131fac87e41 Signed-off-by: Chris Aniszczyk --- .../tst/org/eclipse/jgit/api/ResetCommandTest.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java index 3b0e7bd935..dd6fc67c7b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java @@ -256,6 +256,36 @@ public class ResetCommandTest extends RepositoryTestCase { assertEquals(bEntry.getLastModified(), mixedBEntry.getLastModified()); } + @Test + public void testMixedResetWithUnmerged() throws Exception { + git = new Git(db); + + String file = "a.txt"; + writeTrashFile(file, "data"); + String file2 = "b.txt"; + writeTrashFile(file2, "data"); + + git.add().addFilepattern(file).addFilepattern(file2).call(); + git.commit().setMessage("commit").call(); + + DirCache index = db.lockDirCache(); + DirCacheBuilder builder = index.builder(); + builder.add(createEntry(file, FileMode.REGULAR_FILE, 1, "")); + builder.add(createEntry(file, FileMode.REGULAR_FILE, 2, "")); + builder.add(createEntry(file, FileMode.REGULAR_FILE, 3, "")); + assertTrue(builder.commit()); + + assertEquals("[a.txt, mode:100644, stage:1]" + + "[a.txt, mode:100644, stage:2]" + + "[a.txt, mode:100644, stage:3]", + indexState(0)); + + git.reset().setMode(ResetType.MIXED).call(); + + assertEquals("[a.txt, mode:100644]" + "[b.txt, mode:100644]", + indexState(0)); + } + @Test public void testPathsReset() throws Exception { setupRepository(); -- cgit v1.2.3