diff options
| author | Matthias Sohn | 2016-03-15 14:59:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-03-15 14:59:19 +0000 |
| commit | f2767898fa49724d795225f8f25f61f1538d08ea (patch) | |
| tree | 78100023e21505f39ff80419ca0ce1a80236e7c9 /org.eclipse.egit.ui | |
| parent | f737c86f7f616049671977b054a5d62d0fa36348 (diff) | |
| parent | 71d222e1e23e1579ebde825fe84053fae2f8ea97 (diff) | |
| download | egit-f2767898fa49724d795225f8f25f61f1538d08ea.tar.gz egit-f2767898fa49724d795225f8f25f61f1538d08ea.tar.xz egit-f2767898fa49724d795225f8f25f61f1538d08ea.zip | |
Merge "Support copy/move of workspace if Git repository is under workspace"
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java | 4 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java index e24684cb43..5d21e370c8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java @@ -331,8 +331,10 @@ public class RebaseInteractiveView extends ViewPart implements prefListener = new IPreferenceChangeListener() { @Override public void preferenceChange(PreferenceChangeEvent event) { - if (!RepositoryUtil.PREFS_DIRECTORIES.equals(event.getKey())) + if (!RepositoryUtil.PREFS_DIRECTORIES_REL + .equals(event.getKey())) { return; + } final Repository repo = currentRepository; if (repo == null) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 011117e26a..82cc3f04e3 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -513,8 +513,9 @@ public class StagingView extends ViewPart implements IShowInSource { @Override public void preferenceChange(PreferenceChangeEvent event) { - if (!RepositoryUtil.PREFS_DIRECTORIES.equals(event.getKey())) + if (!RepositoryUtil.PREFS_DIRECTORIES_REL.equals(event.getKey())) { return; + } final Repository repo = currentRepository; if (repo == null) |