From 70ac245a04f0c09a00b768cc6ac3e8cbf35ea883 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 29 Mar 2021 15:47:30 +0200
Subject: [PATCH 1/2] disable git

---
 apps/remix-ide/src/app/files/remixd-handle.js | 6 +++---
 apps/remix-ide/src/app/panels/terminal.js     | 2 +-
 libs/remixd/src/bin/remixd.ts                 | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js
index 73746fa03a3..5b2f02cb350 100644
--- a/apps/remix-ide/src/app/files/remixd-handle.js
+++ b/apps/remix-ide/src/app/files/remixd-handle.js
@@ -38,7 +38,7 @@ export class RemixdHandle extends WebsocketPlugin {
 
   deactivate () {
     if (super.socket) super.deactivate()
-    this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
+    // this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
     this.locahostProvider.close((error) => {
       if (error) console.log(error)
     })
@@ -49,7 +49,7 @@ export class RemixdHandle extends WebsocketPlugin {
   }
 
   async canceled () {
-    await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
+    // await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
     await this.appManager.deactivatePlugin('remixd')
   }
 
@@ -81,7 +81,7 @@ export class RemixdHandle extends WebsocketPlugin {
           }
         }, 3000)
         this.locahostProvider.init(() => {})
-        this.call('manager', 'activatePlugin', 'git')
+        // this.call('manager', 'activatePlugin', 'git')
       }
     }
     if (this.locahostProvider.isConnected()) {
diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js
index 367de3d9434..e5fef96b7f3 100644
--- a/apps/remix-ide/src/app/panels/terminal.js
+++ b/apps/remix-ide/src/app/panels/terminal.js
@@ -749,7 +749,7 @@ class Terminal extends Plugin {
     try {
       let result
       if (script.trim().startsWith('git')) {
-        result = await this.call('git', 'execute', script)
+        // result = await this.call('git', 'execute', script)
       } else {
         result = await this.call('scriptRunner', 'execute', script)
       }
diff --git a/libs/remixd/src/bin/remixd.ts b/libs/remixd/src/bin/remixd.ts
index e0ba1b53017..1f0a473fda8 100644
--- a/libs/remixd/src/bin/remixd.ts
+++ b/libs/remixd/src/bin/remixd.ts
@@ -59,11 +59,12 @@ function startService<S extends 'git' | 'folder'> (service: S, callback: (ws: WS
         sharedFolderClient.setupNotifications(program.sharedFolder)
         sharedFolderClient.sharedFolder(program.sharedFolder, program.readOnly || false)
       })
-
+      /*
       startService('git', (ws: WS, sharedFolderClient: servicesList.Sharedfolder) => {
         sharedFolderClient.setWebSocket(ws)
         sharedFolderClient.sharedFolder(program.sharedFolder, program.readOnly || false)
       })
+      */
     } catch (error) {
       throw new Error(error)
     }

From 8b69795b343e00ba01966582c60ebccaa070ff6f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 29 Mar 2021 16:22:41 +0200
Subject: [PATCH 2/2] diable git e2e test

---
 apps/remix-ide-e2e/src/tests/remixd.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/remixd.test.ts b/apps/remix-ide-e2e/src/tests/remixd.test.ts
index 818834b837b..4dce35ce1f5 100644
--- a/apps/remix-ide-e2e/src/tests/remixd.test.ts
+++ b/apps/remix-ide-e2e/src/tests/remixd.test.ts
@@ -73,7 +73,7 @@ module.exports = {
       .testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11'])
   },
 
-  'Run git status': function (browser) {
+  'Run git status': '' + function (browser) {
     browser
       .executeScript('git status')
       .pause(3000)