From 3158fc0f768b9e93b81df8e691f324f19065a993 Mon Sep 17 00:00:00 2001
From: SteVen Batten <stbatt@microsoft.com>
Date: Thu, 25 Jun 2020 16:55:34 -0700
Subject: [PATCH] scm container fixes

---
 src/vs/workbench/browser/parts/compositeBar.ts           | 3 +--
 src/vs/workbench/contrib/scm/browser/scm.contribution.ts | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index d6fc3a660610a..ae1c9de47437d 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -122,8 +122,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {
 			const draggedViews = this.viewDescriptorService.getViewContainerModel(currentContainer)!.allViewDescriptors;
 
 			// ... all views must be movable
-			// Prevent moving scm explicitly TODO@joaomoreno remove when scm is moveable
-			return !draggedViews.some(v => !v.canMoveView) && currentContainer.id !== 'workbench.view.scm';
+			return !draggedViews.some(v => !v.canMoveView);
 		} else {
 			// Dragging an individual view
 			const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dragData.id);
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 1e915bf02b155..6fbc40f3cfda9 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -56,7 +56,8 @@ const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensio
 	storageId: 'workbench.scm.views.state',
 	icon: Codicon.sourceControl.classNames,
 	alwaysUseContainerInfo: true,
-	order: 2
+	order: 2,
+	hideIfEmpty: true
 }, ViewContainerLocation.Sidebar);
 
 const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);