From faf6a0459749c715d5d9db10e00706f4f644382e Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Wed, 18 Jun 2025 10:22:36 +0200
Subject: [PATCH] ci: Clean UID/GID mismatch

rsync --archive will preserve owner and group, which is then required to
be handled by adding a git safe.directory workaround.

Remove the need for the workaround by only preserving permissions during
the recursive rsync copy.
---
 ci/test/02_run_container.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh
index 9616018e31e..33e250c3e53 100755
--- a/ci/test/02_run_container.sh
+++ b/ci/test/02_run_container.sh
@@ -153,13 +153,9 @@ CI_EXEC () {
 export -f CI_EXEC
 
 # Normalize all folders to BASE_ROOT_DIR
-CI_EXEC rsync --archive --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
+CI_EXEC rsync --recursive --perms --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
 CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh"
 
-# Fixes permission issues when there is a container UID/GID mismatch with the owner
-# of the git source code directory.
-CI_EXEC git config --global --add safe.directory \"*\"
-
 CI_EXEC mkdir -p "${BINS_SCRATCH_DIR}"
 
 CI_EXEC "${BASE_ROOT_DIR}/ci/test/03_test_script.sh"