From 23ef8e4bfe2fd049becd53bc958804dc8906ee75 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sun, 31 Oct 2021 17:17:23 +0000
Subject: [PATCH] Adjust pull command to pull.rebase=false

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c5a479b..4935ca5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -512,7 +512,7 @@ jobs:
       # we do a force pull of the repo to get the correct tag details.
       - name: Get Tag Type
         run: |
-          git pull --tags --force origin HEAD
+          git pull --no-rebase --tags --force origin HEAD
           TYPE=$(git cat-file -t $GITHUB_REF)
           echo "::set-output name=TAGTYPE::$TYPE"