xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename default branch to ‘main’

Browse source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-08-24 12:50:52 -07:00
parent 285a946a1f
commit 53e59c8c09
13 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/deploy-branch
View file

@ -17,7 +17,7 @@ branch_ref=$(git rev-list --max-count=1 "$branch")
[ $? -ne 0 ] && error_out "Unknown branch: $branch"
if [ "$old_ref" == "$branch_ref" ]; then
new_ref=master
new_ref=main
else
ref_name=$(git describe --all --exact "$old_ref")
if [ $? -eq 0 ]; then
@ -31,12 +31,12 @@ fi
git fetch -p
git rebase origin/master "$branch"
[ $? -ne 0 ] && error_out "Rebase onto origin/master failed"
git rebase origin/main "$branch"
[ $? -ne 0 ] && error_out "Rebase onto origin/main failed"
git push . HEAD:master
git push origin master
[ $? -ne 0 ] && error_out "Push of master to origin/master failed"
git push . HEAD:main
git push origin main
[ $? -ne 0 ] && error_out "Push of main to origin/main failed"
git checkout "$new_ref"
git branch -D "$branch"