diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java index fd705a6fbb..aca1eb3cd1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java @@ -85,18 +85,18 @@ public class GitModelSynchronizeParticipant extends ModelSynchronizeParticipant ISynchronizePageConfiguration configuration) { configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID); - String modelProvider; + String modelProvider = WORKSPACE_MODEL_PROVIDER_ID; final IPreferenceStore preferenceStore = Activator.getDefault() .getPreferenceStore(); - if (preferenceStore - .getBoolean(UIPreferences.SYNC_VIEW_ALWAYS_SHOW_CHANGESET_MODEL)) { - modelProvider = GitChangeSetModelProvider.ID; - } else { - String lastSelectedModel = preferenceStore.getString(UIPreferences.SYNC_VIEW_LAST_SELECTED_MODEL); - if (!"".equals(lastSelectedModel)) //$NON-NLS-1$ - modelProvider = lastSelectedModel; - else - modelProvider = WORKSPACE_MODEL_PROVIDER_ID; + if (!gsds.containsFolderLevelSynchronizationRequest()) { + if (preferenceStore + .getBoolean(UIPreferences.SYNC_VIEW_ALWAYS_SHOW_CHANGESET_MODEL)) { + modelProvider = GitChangeSetModelProvider.ID; + } else { + String lastSelectedModel = preferenceStore.getString(UIPreferences.SYNC_VIEW_LAST_SELECTED_MODEL); + if (!"".equals(lastSelectedModel)) //$NON-NLS-1$ + modelProvider = lastSelectedModel; + } } configuration.setProperty( |