From 5ff321c2295a422112c0af995ae8fb04136d1c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Thu, 10 Sep 2020 10:33:03 +0200
Subject: Remove references to master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 .gitlab-ci.yml  |  2 --
 plugins/link.py |  2 +-
 update.sh       | 20 --------------------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6207c8a2..8791838b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
 build-doc:
   stage: build
   only:
-    - master@poezio/poezio
     - main@poezio/poezio
   tags:
     - www
@@ -30,7 +29,6 @@ build-ubuntu:
     paths:
       - dist/
   only:
-    - master
     - main
 
 security-check:
diff --git a/plugins/link.py b/plugins/link.py
index d4929d1a..bb5dba94 100644
--- a/plugins/link.py
+++ b/plugins/link.py
@@ -76,7 +76,7 @@ Options
         Set the default browser started by the plugin
 
 .. _Unix FIFO: https://en.wikipedia.org/wiki/Named_pipe
-.. _daemon.py: https://lab.louiz.org/poezio/poezio/raw/master/poezio/daemon.py
+.. _daemon.py: https://lab.louiz.org/poezio/poezio/raw/main/poezio/daemon.py
 
 """
 import platform
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."
-- 
cgit v1.2.3