Skip to content

Avoid git-switch for better backwards compatibility #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2022
Merged

Avoid git-switch for better backwards compatibility #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d07211e
Update patch
whoisninjaturtle Oct 18, 2022
3b54f07
Update patch
whoisninjaturtle Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ echo "* STAGING *"
echo "************************************"
echo ""
# Create a blank branch to work on
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 +184,7 @@ 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/
composer install --no-scripts > /dev/null
Expand Down