From: Stephen Finucane <stephen@that.guru>
Date: Mon, 18 Jul 2022 11:28:24 +0000 (+0100)
Subject: docs: Actually configure reno to use the main branch
X-Git-Tag: v3.2.0~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b39dabffa4c55f45419b13b240bd924fea84b969;p=thirdparty%2Fpatchwork.git

docs: Actually configure reno to use the main branch

I used the wrong setting [1]

[1] https://docs.openstack.org/reno/latest/user/usage.html#configuring-reno

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
index fd99ee37..ddae386f 100644
--- a/releasenotes/config.yaml
+++ b/releasenotes/config.yaml
@@ -1,5 +1,5 @@
 ---
-branch: main
+default_branch: main
 release_tag_re: 'v\d\.\d\.\d(rc\d+)?'
 pre_release_tag_re: '(?P<pre_release>-rc(?:\d)*)$'
 sections:
diff --git a/tools/post-receive.hook b/tools/post-receive.hook
index 9f2f0503..67f234b0 100755
--- a/tools/post-receive.hook
+++ b/tools/post-receive.hook
@@ -11,7 +11,7 @@ set -eu
 PW_DIR=/opt/patchwork/patchwork
 
 #TODO: the state map should really live in the repo's git-config
-STATE_MAP="refs/heads/master:Accepted"
+STATE_MAP="refs/heads/main:Accepted"
 
 # ignore all commits already present in these refs
 # e.g.,