diff options
| author | Robin Rosenberg | 2011-12-01 14:25:17 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-12-01 14:25:17 +0000 |
| commit | 4e84585b1cf167f8adf88d447f2d954f072481e4 (patch) | |
| tree | c189404f2a656a8a08833177cc757287e9bc0c0d | |
| parent | 199adc61d412c5eb13088b741a673de5debd2335 (diff) | |
| download | egit-4e84585b1cf167f8adf88d447f2d954f072481e4.tar.gz egit-4e84585b1cf167f8adf88d447f2d954f072481e4.tar.xz egit-4e84585b1cf167f8adf88d447f2d954f072481e4.zip | |
Allow deletion of linked resource
Change-Id: I8465aa000ec4a262b9b78f3e02ca80b5ef7bda33
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java index 961b2f643e..b02b641f15 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java @@ -53,6 +53,10 @@ class GitMoveDeleteHook implements IMoveDeleteHook { public boolean deleteFile(final IResourceTree tree, final IFile file, final int updateFlags, final IProgressMonitor monitor) { + // Linked resources are not files, hence not tracked by git + if (file.isLinked()) + return false; + final boolean force = (updateFlags & IResource.FORCE) == IResource.FORCE; if (!force && !tree.isSynchronized(file, IResource.DEPTH_ZERO)) return false; |