Skip to content

Commit

Permalink
Update patch
Browse files Browse the repository at this point in the history
Replace git `switch` with `checkout` for backward compatibility
  • Loading branch information
whoisninjaturtle authored Oct 18, 2022
1 parent fc39938 commit d07211e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/patch
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d07211e

Please sign in to comment.