diff options
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java | 15 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 6 |
2 files changed, 20 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java index 4dfac1447d..a81beb009a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java @@ -543,4 +543,19 @@ public class StashApplyCommandTest extends RepositoryTestCase { assertNotNull(e.getMessage()); } } + + @Test + public void testApplyStashWithDeletedFile() throws Exception { + File file = writeTrashFile("file", "content"); + git.add().addFilepattern("file").call(); + git.commit().setMessage("x").call(); + file.delete(); + git.rm().addFilepattern("file").call(); + git.stashCreate().call(); + file.delete(); + + git.stashApply().setStashRef("stash@{0}").call(); + + assertFalse(file.exists()); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 2ea1160793..710996d2a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -488,7 +488,11 @@ public class ResolveMerger extends ThreeWayMerger { return true; } else if (modeT == 0 && modeB != 0) { // we want THEIRS ... but THEIRS contains the deletion of the - // file + // file. Also, do not complain if the file is already deleted + // locally. This complements the test in isWorktreeDirty() for + // the same case. + if (tw.getTreeCount() > T_FILE && tw.getRawMode(T_FILE) == 0) + return true; toBeDeleted.add(tw.getPathString()); return true; } |