Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Lay2011-08-17 06:35:55 -0400
committerMatthias Sohn2011-08-17 06:35:55 -0400
commit389d7c558716e76af681e1249f3883032fdeebed (patch)
tree37fc978c37a95f3b9e21cff146cc345cfa417002
parentf69abbe1ee4fd9d82401eddc474b79bba7b62150 (diff)
downloadegit-389d7c558716e76af681e1249f3883032fdeebed.tar.gz
egit-389d7c558716e76af681e1249f3883032fdeebed.tar.xz
egit-389d7c558716e76af681e1249f3883032fdeebed.zip
Fix bug when moving folders into location outside repo
GitMoveDeleteHook incorrectly claimed that it has handled the request without doing anything. A test case and a fix for moving projects will follow once I634d5b44bc7fc6a7453b5d718733c9f8f3542840 is merged. Bug: 354293 Change-Id: Ia93c448e5ae0c574c45ab20a57e759e91c7b70dd Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/GitMoveDeleteHook.java4
1 files changed, 2 insertions, 2 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 ae8531a3e5..9884e7bdc4 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
@@ -167,13 +167,13 @@ class GitMoveDeleteHook implements IMoveDeleteHook {
case FAILED:
tree.failed(new Status(IStatus.ERROR, Activator.getPluginId(),
0, CoreText.MoveDeleteHook_operationError, null));
- break;
+ return I_AM_DONE;
case UNTRACKED:
// we are not responsible for moving untracked files
return FINISH_FOR_ME;
}
- tree.standardMoveFolder(srcf, dstf, updateFlags, monitor);
}
+ tree.standardMoveFolder(srcf, dstf, updateFlags, monitor);
} catch (IOException e) {
tree.failed(new Status(IStatus.ERROR, Activator.getPluginId(), 0,
CoreText.MoveDeleteHook_operationError, e));

Back to the top