diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-02-04 01:00:41 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-02-10 11:25:02 +0100 |
| commit | ff83f54d29a2e3c2fda5e25b60bd7d20347c53ca (patch) | |
| tree | e314fc228a60d3aaa8941e10128cb8393ef8a647 /org.eclipse.jgit | |
| parent | e03f18941f5d996d23bc004ad63049bcfc0e53d3 (diff) | |
| download | jgit-ff83f54d29a2e3c2fda5e25b60bd7d20347c53ca.tar.gz jgit-ff83f54d29a2e3c2fda5e25b60bd7d20347c53ca.zip | |
Failing to delete a directory with untracked content is actually ok
We had a test, but it was wrong.
Bug: 424630
Change-Id: I926e0954c8623a323a50fe8be3ebe5e0ac6944c8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 710996d2a8..eca2f91bef 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -244,8 +244,9 @@ public class ResolveMerger extends ThreeWayMerger { String fileName = toBeDeleted.get(i); File f = new File(db.getWorkTree(), fileName); if (!f.delete()) - failingPaths.put(fileName, - MergeFailureReason.COULD_NOT_DELETE); + if (!f.isDirectory()) + failingPaths.put(fileName, + MergeFailureReason.COULD_NOT_DELETE); modifiedFiles.add(fileName); } } finally { |