From 308981d54afdb45a1f9b5579576b907d7945dcd2 Mon Sep 17 00:00:00 2001
From: Joseph Yu <joseph.yu@wwfx.co.uk>
Date: Tue, 21 Jan 2020 16:34:21 +0000
Subject: [PATCH] Strip refs/heads/ from full branch ref path

---
 .github/workflows/wiki.yaml | 3 ++-
 wiki/update-wiki.py         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/wiki.yaml b/.github/workflows/wiki.yaml
index 41f3ba295f..88bb8ebd9c 100644
--- a/.github/workflows/wiki.yaml
+++ b/.github/workflows/wiki.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - wiki-merge-utils
     paths:
       - '.gitlab/workflows/wiki.yaml'
       - 'wiki/**'
@@ -55,7 +56,7 @@ jobs:
   publish:
     name: Publish to GitHub Wiki
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || github.repository == 'wwfxuk/rez'
     needs: build
 
     steps:
diff --git a/wiki/update-wiki.py b/wiki/update-wiki.py
index 1ec6eae3ce..4f6a5b7370 100644
--- a/wiki/update-wiki.py
+++ b/wiki/update-wiki.py
@@ -42,7 +42,7 @@
 TMP_NAME = ".rez-gen-wiki-tmp"  # See also: .gitignore
 TEMP_WIKI_DIR = os.getenv("TEMP_WIKI_DIR", os.path.join(THIS_DIR, TMP_NAME))
 GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", "nerdvegas/rez")
-GITHUB_BRANCH = os.getenv("GITHUB_BRANCH", "master")
+GITHUB_BRANCH = os.getenv("GITHUB_BRANCH", "master").replace("refs/heads/", "")
 GITHUB_WORKFLOW = os.getenv("GITHUB_WORKFLOW", "Wiki")
 CLONE_URL = os.getenv(
     "CLONE_URL",