From 9380225465f09ce2d93f2b3772ed20372c3f8dee Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Thu, 13 Sep 2018 17:02:49 +0200
Subject: [PATCH] fix compilation errors

---
 extensions/git/src/api/git.d.ts  | 5 -----
 extensions/git/src/commands.ts   | 4 ++--
 extensions/git/src/git.ts        | 5 +++++
 extensions/git/src/repository.ts | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 90713d54442..b86b263b940 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -19,11 +19,6 @@ export const enum RefType {
 	Tag
 }
 
-export enum ForcePushMode {
-	Force,
-	ForceWithLease,
-}
-
 export interface Ref {
 	readonly type: RefType;
 	readonly name?: string;
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 4dbe4cb4208..967c02f8468 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, MessageOptions } from 'vscode';
-import { Git, CommitOptions, Stash } from './git';
+import { Git, CommitOptions, Stash, ForcePushMode } from './git';
 import { Repository, Resource, Status, ResourceGroupType } from './repository';
 import { Model } from './model';
 import { toGitUri, fromGitUri } from './uri';
@@ -17,7 +17,7 @@ import { lstat, Stats } from 'fs';
 import * as os from 'os';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
-import { Ref, RefType, Branch, GitErrorCodes, ForcePushMode } from './api/git';
+import { Ref, RefType, Branch, GitErrorCodes } from './api/git';
 
 const localize = nls.loadMessageBundle();
 
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 401f67b148c..241f313614d 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -631,6 +631,11 @@ export interface CommitOptions {
 	empty?: boolean;
 }
 
+export enum ForcePushMode {
+	Force,
+	ForceWithLease,
+}
+
 export class Repository {
 
 	constructor(
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 2eedfa8aa1c..978767ce331 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { commands, Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, DecorationData, Memento, SourceControlInputBoxValidationType } from 'vscode';
-import { Repository as BaseRepository, Commit, Stash, GitError, Submodule, CommitOptions } from './git';
+import { Repository as BaseRepository, Commit, Stash, GitError, Submodule, CommitOptions, ForcePushMode } from './git';
 import { anyEvent, filterEvent, eventToPromise, dispose, find, isDescendant, IDisposable, onceEvent, EmptyDisposable, debounceEvent } from './util';
 import { memoize, throttle, debounce } from './decorators';
 import { toGitUri } from './uri';
@@ -15,7 +15,7 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 import * as fs from 'fs';
 import { StatusBarCommands } from './statusbar';
-import { Branch, Ref, Remote, RefType, GitErrorCodes, ForcePushMode } from './api/git';
+import { Branch, Ref, Remote, RefType, GitErrorCodes } from './api/git';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));