From b3ece9b09f5f25141cc20429f28821aea058db98 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sat, 18 Nov 2023 16:12:17 +0000
Subject: [PATCH] ci: fix kdl commit fetch

Doing a `clone --depth 1` of the default branch then checking out
a commit that might not be the latest of that branch cannot work.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26270>
(cherry picked from commit 5efa4d56e2b7f2440d263ffb794ab3247d70d529)
---
 .gitlab-ci/container/build-kdl.sh | 10 +++++-----
 .pick_status.json                 |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/container/build-kdl.sh b/.gitlab-ci/container/build-kdl.sh
index 5f00cfc6c60..e45127be542 100755
--- a/.gitlab-ci/container/build-kdl.sh
+++ b/.gitlab-ci/container/build-kdl.sh
@@ -5,12 +5,12 @@ set -ex
 
 KDL_REVISION="5056f71b100a68b72b285c6fc845a66a2ed25985"
 
-git clone \
-    https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git \
-    --depth 1 \
-    ci-kdl.git
+mkdir ci-kdl.git
 pushd ci-kdl.git
-git checkout ${KDL_REVISION}
+git init
+git remote add origin https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git
+git fetch --depth 1 origin ${KDL_REVISION}
+git checkout FETCH_HEAD
 popd
 
 python3 -m venv ci-kdl.venv
diff --git a/.pick_status.json b/.pick_status.json
index fcfd455824c..1886593ad02 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -10134,7 +10134,7 @@
         "description": "ci: fix kdl commit fetch",
         "nominated": false,
         "nomination_type": 3,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null