From 56febd875c6defdd4734afa10f3bb0a6bdc2d3bb Mon Sep 17 00:00:00 2001
From: Nicolas Werner <n.werner@famedly.com>
Date: Wed, 23 Feb 2022 02:05:35 +0100
Subject: [PATCH 1/2] Rename default branch of complement.sh to main

The complement.sh script relies on the name of the ref matching the name
of the unpacked folder. The branch redirect from renaming the default
branch breaks that assumption.

Signed-off-by: Nicolas Werner <n.werner@famedly.com>
---
 scripts-dev/complement.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
index e08ffedaf33a..0aecb3daf158 100755
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -5,7 +5,7 @@
 # It makes a Synapse image which represents the current checkout,
 # builds a synapse-complement image on top, then runs tests with it.
 #
-# By default the script will fetch the latest Complement master branch and
+# By default the script will fetch the latest Complement main branch and
 # run tests with that. This can be overridden to use a custom Complement
 # checkout by setting the COMPLEMENT_DIR environment variable to the
 # filepath of a local Complement checkout or by setting the COMPLEMENT_REF
@@ -32,7 +32,7 @@ cd "$(dirname $0)/.."
 
 # Check for a user-specified Complement checkout
 if [[ -z "$COMPLEMENT_DIR" ]]; then
-  COMPLEMENT_REF=${COMPLEMENT_REF:-master}
+  COMPLEMENT_REF=${COMPLEMENT_REF:-main}
   echo "COMPLEMENT_DIR not set. Fetching Complement checkout from ${COMPLEMENT_REF}..."
   wget -Nq https://github.com/matrix-org/complement/archive/${COMPLEMENT_REF}.tar.gz
   tar -xzf ${COMPLEMENT_REF}.tar.gz

From 1e53373a106f1f4cd6ce0ea3034c4bd03867d7e4 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <n.werner@famedly.com>
Date: Wed, 23 Feb 2022 02:10:47 +0100
Subject: [PATCH 2/2] Add changelog

---
 changelog.d/12063.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12063.misc

diff --git a/changelog.d/12063.misc b/changelog.d/12063.misc
new file mode 100644
index 000000000000..e48c5dd08bd7
--- /dev/null
+++ b/changelog.d/12063.misc
@@ -0,0 +1 @@
+Fix using the complement.sh script without specifying a dir or a branch. Contributed by Nico on behalf of Famedly.