From 9eaf366d65789f03340ebeee52e36755020429b1 Mon Sep 17 00:00:00 2001 From: Christopher Brenberg Date: Fri, 16 Apr 2021 09:45:28 -0500 Subject: [PATCH 1/2] change master to main in CLI output when checking out via click --- src/js/visuals/visBranch.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index 1294d54c..428e21c0 100644 --- a/src/js/visuals/visBranch.js +++ b/src/js/visuals/visBranch.js @@ -467,7 +467,12 @@ var VisBranch = VisBase.extend({ return; } - var commandStr = 'git checkout ' + this.get('branch').get('id'); + var branchName = this.get('branch').get('id'); + if (branchName.match(/\bmaster\b/)) { + branchName = branchName.replace(/\bmaster\b/, 'main'); + } + + var commandStr = 'git checkout ' + branchName; var Main = require('../app'); Main.getEventBaton().trigger('commandSubmitted', commandStr); }, From 4148f0b846105a0887142c5ddeda877fa6573ebd Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Fri, 16 Apr 2021 09:03:24 -0600 Subject: [PATCH 2/2] Followup to #823 -- consolidate logic --- src/js/visuals/visBranch.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index 428e21c0..1630aab9 100644 --- a/src/js/visuals/visBranch.js +++ b/src/js/visuals/visBranch.js @@ -467,12 +467,7 @@ var VisBranch = VisBase.extend({ return; } - var branchName = this.get('branch').get('id'); - if (branchName.match(/\bmaster\b/)) { - branchName = branchName.replace(/\bmaster\b/, 'main'); - } - - var commandStr = 'git checkout ' + branchName; + var commandStr = 'git checkout ' + this.gitEngine.resolveNameNoPrefix(this.get('branch')) var Main = require('../app'); Main.getEventBaton().trigger('commandSubmitted', commandStr); },