From 43086243eeeae84226b3ae67d77a0f269e2aa14f Mon Sep 17 00:00:00 2001
From: Cristian Le <git@lecris.dev>
Date: Aug 13 2025 16:01:59 +0000
Subject: Update git origin, but do not set tracking branch


---

diff --git a/roles/fedpkg-build-ng/tasks/main.yaml b/roles/fedpkg-build-ng/tasks/main.yaml
index e5a07cd..674b2c9 100644
--- a/roles/fedpkg-build-ng/tasks/main.yaml
+++ b/roles/fedpkg-build-ng/tasks/main.yaml
@@ -15,13 +15,20 @@
   become: true
 
 # In post-merge pipelines Zuul set explicitly the origin to /dev/null
-- name: Set origin and tracking branch
+- name: Set origin
   command: "{{ item }}"
   args:
     chdir: "{{ zuul.project.src_dir }}"
   loop:
     - git remote set-url origin https://src.fedoraproject.org/{{ zuul.project.name }}
+
+- name: Set tracking branch
+  command: "{{ item }}"
+  args:
+    chdir: "{{ zuul.project.src_dir }}"
+  loop:
     - git branch -u origin/{{ release }}
+  when: not scratch_build
 
 - name: Build package in Fedora build system {% if scratch_build %}(scratch build){% endif %}
   command: |