From 1c424b6c0524c5b5c81248ab765fd92336fc31f5 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 17 Dec 2023 19:28:39 +0100
Subject: [PATCH] ci: do not commit PR testing [skip ci]

---
 get_repo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get_repo.sh b/get_repo.sh
index a903752318e..2ccdd1d72e9 100755
--- a/get_repo.sh
+++ b/get_repo.sh
@@ -14,7 +14,7 @@ if [[ -n "${PULL_REQUEST_ID}" ]]; then
   git fetch --unshallow
   git fetch origin "pull/${PULL_REQUEST_ID}/head"
   git checkout FETCH_HEAD
-  git merge --no-commit "origin/${BRANCH_NAME}"
+  git merge --no-ff --no-commit "origin/${BRANCH_NAME}"
 fi
 
 if [[ -z "${RELEASE_VERSION}" ]]; then