From ef766cd7419cd6574f2bc8df4b866b93bc12bcb1 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Mon, 17 Nov 2025 09:23:30 +0100
Subject: syz-cluster: preserve branches when cloning a repo

Remap remote branches to local ones both when polling remote
repositories and when cloning the distributed repository.

This will ensure that the branches are still accessible via
TreeName/BranchName (it got broken during the latest changes).
---
 syz-cluster/kernel-disk/fetch-kernels-template.yaml     | 2 +-
 syz-cluster/workflow/build-step/workflow-template.yaml  | 2 +-
 syz-cluster/workflow/triage-step/workflow-template.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'syz-cluster')

diff --git a/syz-cluster/kernel-disk/fetch-kernels-template.yaml b/syz-cluster/kernel-disk/fetch-kernels-template.yaml
index 3caeb0166..cc7282d11 100644
--- a/syz-cluster/kernel-disk/fetch-kernels-template.yaml
+++ b/syz-cluster/kernel-disk/fetch-kernels-template.yaml
@@ -70,5 +70,5 @@ spec:
             echo "${NAME}: ${REPO}/${BRANCH}"
             git remote remove ${NAME} || true
             git remote add ${NAME} ${REPO}
-            git fetch ${NAME} ${BRANCH} --tags
+            git fetch ${NAME} ${BRANCH} --tags "+refs/heads/*:refs/heads/${NAME}/*" "+refs/tags/*:refs/tags/${NAME}/*"
             git tag -f ${NAME}-head ${NAME}/${BRANCH}
diff --git a/syz-cluster/workflow/build-step/workflow-template.yaml b/syz-cluster/workflow/build-step/workflow-template.yaml
index 435dd3f4b..7ab46559a 100644
--- a/syz-cluster/workflow/build-step/workflow-template.yaml
+++ b/syz-cluster/workflow/build-step/workflow-template.yaml
@@ -37,7 +37,7 @@ spec:
           - sh
           - -c
           - |
-            git clone --reference /kernel-repo /kernel-repo ./workdir
+            git clone --reference /kernel-repo -c remote.origin.fetch="+refs/heads/*:refs/heads/*" /kernel-repo ./workdir
         env:
         - name: GIT_DISCOVERY_ACROSS_FILESYSTEM
           value: "1"
diff --git a/syz-cluster/workflow/triage-step/workflow-template.yaml b/syz-cluster/workflow/triage-step/workflow-template.yaml
index fea06deb8..35a163bdd 100644
--- a/syz-cluster/workflow/triage-step/workflow-template.yaml
+++ b/syz-cluster/workflow/triage-step/workflow-template.yaml
@@ -23,7 +23,7 @@ spec:
             - sh
             - -c
             - |
-              git clone --reference /kernel-repo /kernel-repo /workdir
+              git clone --reference /kernel-repo -c remote.origin.fetch="+refs/heads/*:refs/heads/*" /kernel-repo /workdir
           env:
             - name: GIT_DISCOVERY_ACROSS_FILESYSTEM
               value: "1"
-- 
cgit mrf-deployment