From d07211eba1b0f1db00eba574f4b538308be1b4c1 Mon Sep 17 00:00:00 2001 From: whoisninjaturtle <63665689+whoisninjaturtle@users.noreply.github.com> Date: Tue, 18 Oct 2022 16:28:10 -0500 Subject: [PATCH 1/2] Update patch Replace git `switch` with `checkout` for backward compatibility --- src/patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/patch b/src/patch index 4de08e4..4639b1a 100755 --- a/src/patch +++ b/src/patch @@ -138,7 +138,9 @@ echo "* STAGING *" echo "************************************" echo "" # Create a blank branch to work on -git switch --orphan tatter/scratch +#git switch --orphan tatter/scratch +git checkout --orphan tatter/scratch +git rm -rf . # Bring over just what we need to recreate the framework git checkout "$BASE" -- .gitignore composer.* @@ -183,7 +185,8 @@ git commit -m "Patch framework" --no-verify rm composer.* # Create the new branch from base -git switch -c tatter/patches "$BASE" +#git switch -c tatter/patches "$BASE" +git checkout -b tatter/patches "$BASE" # Restore the original state of vendor/ composer install --no-scripts > /dev/null From 3b54f0760e223b2e5ece3112199a34f0dc81b822 Mon Sep 17 00:00:00 2001 From: whoisninjaturtle <63665689+whoisninjaturtle@users.noreply.github.com> Date: Tue, 18 Oct 2022 17:50:17 -0500 Subject: [PATCH 2/2] Update patch Remove comments --- src/patch | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/patch b/src/patch index 4639b1a..d6e1cb8 100755 --- a/src/patch +++ b/src/patch @@ -138,7 +138,6 @@ echo "* STAGING *" echo "************************************" echo "" # Create a blank branch to work on -#git switch --orphan tatter/scratch git checkout --orphan tatter/scratch git rm -rf . @@ -185,7 +184,6 @@ git commit -m "Patch framework" --no-verify rm composer.* # Create the new branch from base -#git switch -c tatter/patches "$BASE" git checkout -b tatter/patches "$BASE" # Restore the original state of vendor/