From 226a3427ce35745a1d4a3e71e0471e32a21bc290 Mon Sep 17 00:00:00 2001
From: Eike Waldt <waldt@b1-systems.de>
Date: Thu, 9 Apr 2026 15:13:21 +0200
Subject: [PATCH] fix: fix checking out of locked commits

Signed-off-by: Eike Waldt <waldt@b1-systems.de>
On-behalf-of: SAP <eike.waldt@sap.com>
---
 src/aggregation/fetcher.py | 48 +++++++++++---------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/aggregation/fetcher.py b/src/aggregation/fetcher.py
index 1f033e4..b34dd4f 100644
--- a/src/aggregation/fetcher.py
+++ b/src/aggregation/fetcher.py
@@ -74,7 +74,7 @@ def _fetch_remote(
                 print(f"  Root files: {', '.join(repo.root_files)}")
             print(f"  Output: {output_dir}")
             
-            # Initialize sparse checkout
+            # Initialize git repository
             subprocess.run(["git", "init"], check=True, capture_output=True, cwd=temp_dir)
             subprocess.run(
                 ["git", "remote", "add", "origin", repo.url],
@@ -82,32 +82,27 @@ def _fetch_remote(
                 capture_output=True,
                 cwd=temp_dir,
             )
+            
+            # Fetch the ref (full history to support any locked commit)
+            print("  Fetching repository...")
             subprocess.run(
-                ["git", "config", "core.sparseCheckout", "true"],
+                ["git", "fetch", "--all"],
                 check=True,
                 capture_output=True,
                 cwd=temp_dir,
             )
             
-            # Configure sparse checkout patterns
-            # Git sparse-checkout doesn't support **, so convert to folder prefixes
-            sparse_checkout_file = temp_dir / ".git" / "info" / "sparse-checkout"
-            with open(sparse_checkout_file, "w") as f:
-                f.write(f"{repo.docs_path}/*\n")
-                for root_file in repo.root_files:
-                    converted = _convert_to_git_pattern(root_file)
-                    f.write(f"{converted}\n")
+            # Determine which commit to checkout:
+            # - In update-locks mode: always checkout the ref (latest)
+            # - In normal mode: use locked commit if available, otherwise checkout ref
+            if self.update_locks or not repo.commit:
+                checkout_ref = repo.ref
+            else:
+                checkout_ref = repo.commit
             
-            # Fetch and checkout
-            print("  Cloning (sparse checkout)...")
-            subprocess.run(
-                ["git", "fetch", "--depth=1", "origin", repo.ref],
-                check=True,
-                capture_output=True,
-                cwd=temp_dir,
-            )
+            print(f"  Checking out: {checkout_ref}")
             subprocess.run(
-                ["git", "checkout", repo.ref],
+                ["git", "checkout", checkout_ref],
                 check=True,
                 capture_output=True,
                 cwd=temp_dir,
@@ -124,21 +119,6 @@ def _fetch_remote(
             resolved_commit = result.stdout.strip()
             print(f"  Resolved commit: {resolved_commit}")
             
-            # Verify commit lock if specified
-            if repo.commit:
-                if resolved_commit != repo.commit:
-                    if self.update_locks:
-                        # In update-locks mode, commit mismatch is expected
-                        print(f"  Updating lock: {repo.commit[:8]} → {resolved_commit[:8]}")
-                    else:
-                        # In normal mode, commit mismatch is an error
-                        print(f"  Warning: Commit mismatch!", file=sys.stderr)
-                        print(f"    Expected: {repo.commit}", file=sys.stderr)
-                        print(f"    Got: {resolved_commit}", file=sys.stderr)
-                        return False, resolved_commit
-                else:
-                    print(f"  ✓ Commit lock verified")
-            
             # Copy docs to output directory
             docs_source = temp_dir / repo.docs_path
             if docs_source.exists():