q3aql/nanorc
q3aql/nanorc
1
0
Fork 0
mirror of https://github.com/scopatz/nanorc synced 2025-04-06 14:10:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix create-branches script to work upstream

Browse Source
This commit is contained in:
Ross Smith II 2021-06-06 13:17:24 -07:00 committed by GitHub
parent 636dad0b3d
commit 234327358d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
create-branches.sh
View File

@ -17,14 +17,14 @@ branches=(
pre-2.1.5 pre-2.1.5
) )
git clone https://github.com/rasa/nanorc # git clone https://github.com/rasa/nanorc
cd nanorc # cd nanorc
git remote remove upstream || true # git remote remove upstream || true
git remote add upstream https://github.com/scopatz/nanorc # git remote add upstream https://github.com/scopatz/nanorc
git fetch upstream # git fetch upstream
# https://stackoverflow.com/a/42332860/1432614 # https://stackoverflow.com/a/42332860/1432614
@ -32,10 +32,10 @@ git fetch upstream
git checkout master git checkout master
# pulls all new commits made to upstream/master # pulls all new commits made to upstream/master
git pull upstream master # git pull upstream master
# this will delete all your local changes to master # this will delete all your local changes to master
git reset --hard upstream/master # git reset --hard upstream/master
for branch in "${branches[@]}"; do for branch in "${branches[@]}"; do
git branch -D "${branch}" || true git branch -D "${branch}" || true
@ -113,10 +113,10 @@ sed -E -i.bak -e 's/(icolor\s+brightwhite.*\*\()\|/\1/' "${nanos[@]}"
sed -E -i.bak -e 's/(color\s+red\s+.*\)\.\*)\+/\1\\+/' "${nanos[@]}" sed -E -i.bak -e 's/(color\s+red\s+.*\)\.\*)\+/\1\\+/' "${nanos[@]}"
git commit -am "fix: pre-2.1.5: fix bad regexes" git commit -am "fix: pre-2.1.5: fix bad regexes"
git checkout master # git checkout master
# take care, this will delete all your changes on your forked master # take care, this will delete all your changes on your forked master
git push --force origin master # git push --force origin master
for branch in "${branches[@]}"; do for branch in "${branches[@]}"; do
git checkout "${branch}" git checkout "${branch}"