summaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorMaxime “pep” Buquet <pep@bouah.net>2020-09-10 10:33:03 +0200
committerMaxime “pep” Buquet <pep@bouah.net>2020-09-10 10:33:03 +0200
commit5ff321c2295a422112c0af995ae8fb04136d1c23 (patch)
tree55b5bc626b30d5b419e4b62f1c2df9f7c7c21c6d /update.sh
parentb27c01bc9b9d345cee053b9e28d9dbfdf956b6bb (diff)
downloadpoezio-5ff321c2295a422112c0af995ae8fb04136d1c23.tar.gz
poezio-5ff321c2295a422112c0af995ae8fb04136d1c23.tar.bz2
poezio-5ff321c2295a422112c0af995ae8fb04136d1c23.tar.xz
poezio-5ff321c2295a422112c0af995ae8fb04136d1c23.zip
Remove references to master
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh20
1 files changed, 0 insertions, 20 deletions
diff --git a/update.sh b/update.sh
index 92588fc0..e8ba0d0a 100755
--- a/update.sh
+++ b/update.sh
@@ -27,26 +27,6 @@ $POEZIO_PYTHON -c 'import venv' &> /dev/null || {
exit 1
}
-# XXX: Migration from master branch to main
-branch=$(git rev-parse --abbrev-ref HEAD)
-changes=$(git status --porcelain | grep -v "^??")
-if [ "$branch" == "master" ]; then
- echo "! WARNING !"
- echo "We are changing our default branch to 'main' and we have detected"
- echo "you are still using 'master'."
- echo
-
- if [ -n "$changes" ]; then
- echo "! Manual action required !"
- echo "There are uncommited changes in your staging area. Please sort this"
- echo "out and then manually checkout the 'main' branch using 'git checkout main'."
- exit 1
- fi
-
- git checkout main
- echo "Automatically switched to 'main' branch."
-fi
-
echo 'Updating poezio'
git pull --ff-only origin main || {
echo "The script failed to update poezio."