From 11448ed428be865b9b741da7b07ee36e7e9250d7 Mon Sep 17 00:00:00 2001
From: Ulysse ARNAUD <mexanga@gmail.com>
Date: Wed, 16 Sep 2020 20:35:07 +0200
Subject: [PATCH] Added git switch with '-' and '-c' as optional arguments

---
 src/js/git/commands.js | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/js/git/commands.js b/src/js/git/commands.js
index 008fc48b..1e883ea0 100644
--- a/src/js/git/commands.js
+++ b/src/js/git/commands.js
@@ -855,6 +855,48 @@ var commandConfig = {
       command.twoArgsImpliedHead(generalArgs);
       engine.tag(generalArgs[0], generalArgs[1]);
     }
+  },
+
+  switch: {
+    sc: /^(gsw|git sw)($|\s)/,
+    regex: /^git +switch($|\s)/,
+    options: [
+      '-c',
+      '-'
+    ],
+    execute: function(engine, command) {
+      var generalArgs = command.getGeneralArgs();
+      var commandOptions = command.getOptionsMap();
+
+      var args = null;
+      if (commandOptions['-c']) {
+        // the user is really trying to just make a
+        // branch and then switch to it. so first:
+        args = commandOptions['-c'].concat(generalArgs);
+        command.twoArgsImpliedHead(args, '-c');
+
+        var validId = engine.validateBranchName(args[0]);
+        engine.branch(validId, args[1]);
+        engine.checkout(validId);
+        return;
+      }
+
+      if (commandOptions['-']) {
+        // get the heads last location
+        var lastPlace = engine.HEAD.get('lastLastTarget');
+        if (!lastPlace) {
+          throw new GitError({
+            msg: intl.str('git-result-nothing')
+          });
+        }
+        engine.HEAD.set('target', lastPlace);
+        return;
+      }
+
+      command.validateArgBounds(generalArgs, 1, 1);
+
+      engine.checkout(engine.crappyUnescape(generalArgs[0]));
+    }
   }
 };