From 442d693a0a1f3b971fdbd55b878c94d2a29b468c Mon Sep 17 00:00:00 2001 From: SPGoding <15277496+SPGoding@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:35:50 -0500 Subject: [PATCH] Disable 'git switch' along with 'git checkout' --- src/levels/remote/pushArgs.js | 3 ++- src/levels/remote/sourceNothing.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/levels/remote/pushArgs.js b/src/levels/remote/pushArgs.js index 89f152fc..d0cbc305 100644 --- a/src/levels/remote/pushArgs.js +++ b/src/levels/remote/pushArgs.js @@ -3,7 +3,8 @@ exports.level = { "solutionCommand": "git push origin main;git push origin foo", "startTree": "{\"branches\":{\"main\":{\"target\":\"C2\",\"id\":\"main\",\"remoteTrackingBranchID\":\"o/main\"},\"foo\":{\"target\":\"C3\",\"id\":\"foo\",\"remoteTrackingBranchID\":\"o/foo\"},\"o/main\":{\"target\":\"C1\",\"id\":\"o/main\",\"remoteTrackingBranchID\":null},\"o/foo\":{\"target\":\"C1\",\"id\":\"o/foo\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"C0\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":null},\"foo\":{\"target\":\"C1\",\"id\":\"foo\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"}}}", "disabledMap": { - "git checkout": true + "git checkout": true, + "git switch": true }, "name": { "en_US": "Git push arguments", diff --git a/src/levels/remote/sourceNothing.js b/src/levels/remote/sourceNothing.js index 5111f682..4f838932 100644 --- a/src/levels/remote/sourceNothing.js +++ b/src/levels/remote/sourceNothing.js @@ -2,7 +2,8 @@ exports.level = { "compareAllBranchesAndEnforceBranchCleanup": true, "disabledMap": { "git branch": true, - "git checkout": true + "git checkout": true, + "git switch": true }, "goalTreeString": "{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":\"o/main\"},\"o/main\":{\"target\":\"C1\",\"id\":\"o/main\",\"remoteTrackingBranchID\":null},\"bar\":{\"target\":\"C1\",\"id\":\"bar\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"}}}", "solutionCommand": "git push origin :foo;git fetch origin :bar",