diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy
index 467fcc38c4c..024a2bd7437 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/tree/GitClientTest.groovy
@@ -87,10 +87,10 @@ class GitClientTest extends Specification {
 
   def "test is shallow"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def shallow = gitClient.isShallow()
 
     then:
@@ -111,22 +111,22 @@ class GitClientTest extends Specification {
 
   def "test get upstream branch SHA"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def upstreamBranch = gitClient.getUpstreamBranchSha()
 
     then:
-    upstreamBranch == "98b944cc44f18bfb78e3021de2999cdcda8efdf6"
+    upstreamBranch == "c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd"
   }
 
   def "test unshallow: sha-#remoteSha"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def gitClient = givenGitClient()
+    def gitClient = givenGitClient("repo")
     def shallow = gitClient.isShallow()
     def commits = gitClient.getLatestCommits()
 
@@ -209,11 +209,11 @@ class GitClientTest extends Specification {
 
   def "test get commit info with fetching"() {
     given:
-    givenGitRepo("ci/git/shallow/git")
+    givenGitRepos(["ci/git/shallow_with_origin/origin", "ci/git/shallow_with_origin/repo"])
 
     when:
-    def commit = "f4377e97f10c2d58696192b170b2fef2a8464b04"
-    def gitClient = givenGitClient()
+    def commit = "6e55a15a35ad46f74e4203dd42f7797173a6edcb"
+    def gitClient = givenGitClient("repo")
     def commitInfo = gitClient.getCommitInfo(commit, false)
 
     then:
@@ -224,13 +224,13 @@ class GitClientTest extends Specification {
 
     then:
     commitInfo.sha == commit
-    commitInfo.author.name == "sullis"
-    commitInfo.author.email == "github@seansullivan.com"
-    commitInfo.author.iso8601Date == "2023-05-30T07:07:35-07:00"
-    commitInfo.committer.name == "GitHub"
-    commitInfo.committer.email == "noreply@github.com"
-    commitInfo.committer.iso8601Date == "2023-05-30T07:07:35-07:00"
-    commitInfo.fullMessage == "brotli4j 1.12.0 (#1592)"
+    commitInfo.author.name == "Test Author"
+    commitInfo.author.email == "test-author@example.com"
+    commitInfo.author.iso8601Date == "2026-03-12T17:02:46+01:00"
+    commitInfo.committer.name == "Test Author"
+    commitInfo.committer.email == "test-author@example.com"
+    commitInfo.committer.iso8601Date == "2026-03-12T17:02:46+01:00"
+    commitInfo.fullMessage == "Commit message 0"
   }
 
   def "test get latest commits"() {
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/dummy.txt b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/dummy.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/description b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/description
deleted file mode 100644
index 498b267a8c7..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/index b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/index
deleted file mode 100644
index 7e85fb0abe6..00000000000
Binary files a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/index and /dev/null differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/info/exclude b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/info/exclude
deleted file mode 100644
index a5196d1be8f..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/info/exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/HEAD b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/HEAD
deleted file mode 100644
index 9527e7281e1..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 98b944cc44f18bfb78e3021de2999cdcda8efdf6 Nikita Tkachenko <nikita.tkachenko@datadoghq.com> 1687280379 +0200	clone: from github.com:Netflix/zuul.git
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/heads/master b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/heads/master
deleted file mode 100644
index 9527e7281e1..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/heads/master
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 98b944cc44f18bfb78e3021de2999cdcda8efdf6 Nikita Tkachenko <nikita.tkachenko@datadoghq.com> 1687280379 +0200	clone: from github.com:Netflix/zuul.git
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/remotes/origin/HEAD b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/remotes/origin/HEAD
deleted file mode 100644
index 9527e7281e1..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/logs/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 98b944cc44f18bfb78e3021de2999cdcda8efdf6 Nikita Tkachenko <nikita.tkachenko@datadoghq.com> 1687280379 +0200	clone: from github.com:Netflix/zuul.git
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.idx b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.idx
deleted file mode 100644
index 893dbbdd5e3..00000000000
Binary files a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.idx and /dev/null differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.pack b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.pack
deleted file mode 100644
index 31240eda865..00000000000
Binary files a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/objects/pack/pack-5d8e32f4728b0c4a1ce9a1df8abf396036e42acb.pack and /dev/null differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/packed-refs b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/packed-refs
deleted file mode 100644
index 76b054de75a..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/packed-refs
+++ /dev/null
@@ -1,2 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted 
-98b944cc44f18bfb78e3021de2999cdcda8efdf6 refs/remotes/origin/master
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/heads/master b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/heads/master
deleted file mode 100644
index e9cca1fc9e8..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/heads/master
+++ /dev/null
@@ -1 +0,0 @@
-98b944cc44f18bfb78e3021de2999cdcda8efdf6
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/remotes/origin/HEAD b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/remotes/origin/HEAD
deleted file mode 100644
index 6efe28fff83..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/remotes/origin/master
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/shallow b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/shallow
deleted file mode 100644
index e9cca1fc9e8..00000000000
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/shallow
+++ /dev/null
@@ -1 +0,0 @@
-98b944cc44f18bfb78e3021de2999cdcda8efdf6
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/build_script.txt b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/build_script.txt
new file mode 100644
index 00000000000..9522bb95bdd
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/build_script.txt
@@ -0,0 +1,79 @@
+#!/bin/bash
+set -e
+
+# IMPORTANT: always use relative paths, as tests move the folders to temp dirs
+base_path="/tmp/shallow_with_origin/"
+origin_path="origin"
+repo_path="repo"
+
+rm -rf $base_path
+mkdir -p $base_path
+cd $base_path
+
+# create bare origin
+mkdir -p $origin_path
+cd $origin_path && git init --bare --initial-branch=master
+cd ..
+
+# create working copy to populate origin with commits
+mkdir -p work && cd work
+git init --initial-branch=master
+git remote add origin "../$origin_path"
+git config user.email "test-author@example.com"
+git config user.name "Test Author"
+
+# create 10 commits
+for i in $(seq 0 9); do
+  echo "content $i" >> "file${i}.txt"
+  git add .
+  git commit -m "Commit message ${i}"
+done
+
+git push origin master
+cd ..
+
+# create shallow clone from origin (use file:// URL so --depth works, fix config after)
+git clone --depth 1 "file://$base_path/$origin_path" $repo_path
+
+# print commit SHAs for reference
+echo "=== COMMIT SHAs ==="
+cd work
+git log --format="%H %s" --reverse
+first_commit=$(git log --format="%H" --reverse | head -1)
+echo "=== FIRST COMMIT (not in shallow clone): $first_commit ==="
+cd ..
+
+echo "=== SHALLOW CLONE HEAD ==="
+cd $repo_path
+git log --format="%H %s"
+echo "=== IS SHALLOW ==="
+git rev-parse --is-shallow-repository
+cd ..
+
+# cleanup origin (remove unnecessary files)
+(cd $origin_path && rm -rf hooks info logs COMMIT_EDITMSG description)
+
+# cleanup working repo (shallow clone) - rename .git to git
+(cd $repo_path && rm -rf .git/hooks .git/info .git/logs .git/COMMIT_EDITMSG .git/description .git/index && mv .git git)
+
+# update the repo config to use relative path (git clone uses absolute)
+cd $repo_path/git
+# Replace the absolute URL with relative path
+python3 -c "
+import re
+with open('config', 'r') as f:
+    content = f.read()
+content = re.sub(r'url = .*/origin', 'url = ../origin', content)
+with open('config', 'w') as f:
+    f.write(content)
+"
+cd ../..
+
+echo "=== ORIGIN CONFIG ==="
+cat $origin_path/config
+echo ""
+echo "=== REPO CONFIG ==="
+cat $repo_path/git/config
+echo ""
+echo "=== DONE ==="
+echo "Resources at: $base_path"
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/HEAD b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/HEAD
similarity index 100%
rename from dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/HEAD
rename to dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/HEAD
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/config b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/config
new file mode 100644
index 00000000000..e6da231579b
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/config
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/03/5f9b742ebf552ed87f003d4944480bfea6ba99 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/03/5f9b742ebf552ed87f003d4944480bfea6ba99
new file mode 100644
index 00000000000..28f856e0422
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/03/5f9b742ebf552ed87f003d4944480bfea6ba99 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/04/91fb935b55dd8540bb73107cf3bb8e87295f38 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/04/91fb935b55dd8540bb73107cf3bb8e87295f38
new file mode 100644
index 00000000000..68efbd02c53
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/04/91fb935b55dd8540bb73107cf3bb8e87295f38 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/06/62c64ab1577a242b69147e4db7b0944aea7c59 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/06/62c64ab1577a242b69147e4db7b0944aea7c59
new file mode 100644
index 00000000000..8b6201f3449
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/06/62c64ab1577a242b69147e4db7b0944aea7c59 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/1a/d0869257423218471478b0e2c64182dc62ea66 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/1a/d0869257423218471478b0e2c64182dc62ea66
new file mode 100644
index 00000000000..2b72e32b289
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/1a/d0869257423218471478b0e2c64182dc62ea66 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/23/e08071b1db93bf70e59f586d3241036d7676fc b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/23/e08071b1db93bf70e59f586d3241036d7676fc
new file mode 100644
index 00000000000..0f999c22c8a
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/23/e08071b1db93bf70e59f586d3241036d7676fc differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/2e/995eb933f07ca377b8dd8a093bf80a83c257a2 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/2e/995eb933f07ca377b8dd8a093bf80a83c257a2
new file mode 100644
index 00000000000..14dcfa63745
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/2e/995eb933f07ca377b8dd8a093bf80a83c257a2 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/37/5380121cbe5dc44c75f873b8c7ee1638bb20e5 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/37/5380121cbe5dc44c75f873b8c7ee1638bb20e5
new file mode 100644
index 00000000000..4854c672680
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/37/5380121cbe5dc44c75f873b8c7ee1638bb20e5 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/48/d2c5157523fda29176a438843267660ca6f339 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/48/d2c5157523fda29176a438843267660ca6f339
new file mode 100644
index 00000000000..24f56e549fb
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/48/d2c5157523fda29176a438843267660ca6f339 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/49/99f131df6d18a74e842bae0c275941f7831249 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/49/99f131df6d18a74e842bae0c275941f7831249
new file mode 100644
index 00000000000..2d02c84406c
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/49/99f131df6d18a74e842bae0c275941f7831249
@@ -0,0 +1 @@
+x
+)JMU044d040031QH��I5�+�(a8}�d��mr[WwE�m,�ȋ�FRdV����S��kѓ.��/=h^����"#�"_�����h���r�gG�ԂK�
�.�
\ No newline at end of file
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/0dd1f1bd0c254172b401d87109a9c234d86ba9 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/0dd1f1bd0c254172b401d87109a9c234d86ba9
new file mode 100644
index 00000000000..27ab85bbaa6
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/0dd1f1bd0c254172b401d87109a9c234d86ba9 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/4bc1c77f63bd5429cb0ab4d74cb8729570d293 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/4bc1c77f63bd5429cb0ab4d74cb8729570d293
new file mode 100644
index 00000000000..dd33a633876
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/4d/4bc1c77f63bd5429cb0ab4d74cb8729570d293 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/5b/7a80d8f027b2d78b2f8a665fac7bac810bcbd5 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/5b/7a80d8f027b2d78b2f8a665fac7bac810bcbd5
new file mode 100644
index 00000000000..f91235fffb1
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/5b/7a80d8f027b2d78b2f8a665fac7bac810bcbd5 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/62/1f347db1d56ee2876551b8afdb73f6f5cd9b5b b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/62/1f347db1d56ee2876551b8afdb73f6f5cd9b5b
new file mode 100644
index 00000000000..21c4167572a
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/62/1f347db1d56ee2876551b8afdb73f6f5cd9b5b differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6c/11c899f73a3954cf6b5a17ebc8633eafebbea5 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6c/11c899f73a3954cf6b5a17ebc8633eafebbea5
new file mode 100644
index 00000000000..6e766720016
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6c/11c899f73a3954cf6b5a17ebc8633eafebbea5 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6e/55a15a35ad46f74e4203dd42f7797173a6edcb b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6e/55a15a35ad46f74e4203dd42f7797173a6edcb
new file mode 100644
index 00000000000..be0442b1f45
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/6e/55a15a35ad46f74e4203dd42f7797173a6edcb differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/70/26c29355f94d1d121cce9f16ac88db570023cd b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/70/26c29355f94d1d121cce9f16ac88db570023cd
new file mode 100644
index 00000000000..aa00a6b728e
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/70/26c29355f94d1d121cce9f16ac88db570023cd
@@ -0,0 +1 @@
+x
��M��0�{���}���R[�oX�H���
�$�mį/l�=u���yF�j4�J���I?L7��)j\QD9Ť�%�g�$B�3ΘQI�b�����-��4�E1%�DT��ܬjn	�qÑ(qɀ|���s5N�~�O�R<?_�]�^}���"�	!�0
�d`�˚��o��Ҏ�-|^���8�Y�,S;/~����qa����vI/Yզ"���w]r*P�w+k���>��5�M�������'�����߰:��(�y`��
��b-l�0��_��E;�J\���E���Q����n�}���_]�\�St<�?H3��l6zr���z��GI�����{��o���\(�
�gVxg)'�>��Q�{�?��9����1��x�A��l��/�V�}
\ No newline at end of file
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/75/db99094e57d9f02f7eca73dd08f93ce2e302ba b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/75/db99094e57d9f02f7eca73dd08f93ce2e302ba
new file mode 100644
index 00000000000..2dc0f778554
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/75/db99094e57d9f02f7eca73dd08f93ce2e302ba differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/8d/c57bcc0891edd46d2e69890fad7a96bd837dca b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/8d/c57bcc0891edd46d2e69890fad7a96bd837dca
new file mode 100644
index 00000000000..d81f5a97f3f
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/8d/c57bcc0891edd46d2e69890fad7a96bd837dca differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/99/976b0393834a1238c2fa74cd798222f718b2b6 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/99/976b0393834a1238c2fa74cd798222f718b2b6
new file mode 100644
index 00000000000..cdf283a966d
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/99/976b0393834a1238c2fa74cd798222f718b2b6 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/a0/054e492840f572e48a3cb791d2e083afaf08f6 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/a0/054e492840f572e48a3cb791d2e083afaf08f6
new file mode 100644
index 00000000000..caa4f79235a
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/a0/054e492840f572e48a3cb791d2e083afaf08f6 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/aa/c30baac47ad1ab57c40da29bf39895bddec2d8 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/aa/c30baac47ad1ab57c40da29bf39895bddec2d8
new file mode 100644
index 00000000000..f08bdb298c3
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/aa/c30baac47ad1ab57c40da29bf39895bddec2d8 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/b1/32e6aa2561ac807452786c9a3c98a6de99f718 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/b1/32e6aa2561ac807452786c9a3c98a6de99f718
new file mode 100644
index 00000000000..8044427c9f5
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/b1/32e6aa2561ac807452786c9a3c98a6de99f718
@@ -0,0 +1,2 @@
+x
��M��0�{���=���i[��v�@��I�H	IS~}as�SG�g4�F�m]{h,�O}���D��8[j�9�3��Ÿ�+�T�p.:���D�	bQè���,��*�
+��,
!B�ŵ��v0S���܏�ӣ�M݋���g��_!6MJ)�������k��
���x�OS,� J`��0�����7���$ʑ�)6c��ւ&������q��&vH��AXuP�Q��L���W���u��QM���w�i���.�¶�Cx�[4�e6�&C�`�w#�d�
�D7�k���-�3���|wf�a+��O���)~��̭v�[��U�[u�����Ϝ��
�y_nn�kg��~��/�te�/�q/q?:p�Q�˥8(��?!ӥ0
\ No newline at end of file
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/c7/6ef954d23f8fdb42dcf2fe956d6af5a31fe7bd b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/c7/6ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
new file mode 100644
index 00000000000..c58b40d4c49
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/c7/6ef954d23f8fdb42dcf2fe956d6af5a31fe7bd differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/cb/d03493c413b61eb5ab8a5a4eb17712286e5d8b b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/cb/d03493c413b61eb5ab8a5a4eb17712286e5d8b
new file mode 100644
index 00000000000..75137775197
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/cb/d03493c413b61eb5ab8a5a4eb17712286e5d8b differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ce/637da508bf67e5249a0721129fca5e7f0ea7eb b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ce/637da508bf67e5249a0721129fca5e7f0ea7eb
new file mode 100644
index 00000000000..2ba5d447263
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ce/637da508bf67e5249a0721129fca5e7f0ea7eb differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d0/b00a988cc19e4882df65d586311a361e77ed82 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d0/b00a988cc19e4882df65d586311a361e77ed82
new file mode 100644
index 00000000000..7f6fa69ceb9
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d0/b00a988cc19e4882df65d586311a361e77ed82 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d7/c9aa1754730abbb4748607f685795968351ea8 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d7/c9aa1754730abbb4748607f685795968351ea8
new file mode 100644
index 00000000000..12bbae587a4
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/d7/c9aa1754730abbb4748607f685795968351ea8 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ec/7443c854237077ac2bbca423aad88ca670ecfa b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ec/7443c854237077ac2bbca423aad88ca670ecfa
new file mode 100644
index 00000000000..c3cc5bca18b
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/ec/7443c854237077ac2bbca423aad88ca670ecfa
@@ -0,0 +1,3 @@
+x
��Mo�@�{�_��(�~���V�c�Rʒ��Xh
+bp>���5��4�;�h^�FS�]�4A����h-D��U�R�s^��3��b$��湴R�WT���a�ؔH:.�J�d3!sdI�0,IY8��
�4��P�q��E�Lsq}i��o�Z���A)��q�����kN��
��jx��*#�d�(T�N��(E��[�~N?^Ԯ���=>4��ǺYX��\��	�.��(ϤSl�Mz��p�;ܶGbj-�g�A˄���C,��eg�[4�^Ț��Y�6�#�t�
\�o��~
+�E�b��fx/�_���}�i������td�ts�b�C��L�
�3���\����Jg�p����r�@���/���q4���tΤ~
\ No newline at end of file
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f1/f36270ff97895ac0f75837c262cfcb3c21cc2f b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f1/f36270ff97895ac0f75837c262cfcb3c21cc2f
new file mode 100644
index 00000000000..b6ed3797c90
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f1/f36270ff97895ac0f75837c262cfcb3c21cc2f differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f8/d3a988b4b6abe60fee48ecccad69efa7cf2639 b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f8/d3a988b4b6abe60fee48ecccad69efa7cf2639
new file mode 100644
index 00000000000..9b36b062fc5
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/objects/f8/d3a988b4b6abe60fee48ecccad69efa7cf2639 differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/refs/heads/master b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/refs/heads/master
new file mode 100644
index 00000000000..2853a7db1bc
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/origin/refs/heads/master
@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/HEAD b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/HEAD
new file mode 100644
index 00000000000..cb089cd89a7
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/config
similarity index 86%
rename from dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config
rename to dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/config
index f145b18c5c0..01969e97449 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow/git/config
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/config
@@ -6,7 +6,7 @@
 	ignorecase = true
 	precomposeunicode = true
 [remote "origin"]
-	url = https://github.com/Netflix/zuul.git
+	url = ../origin
 	fetch = +refs/heads/master:refs/remotes/origin/master
 [branch "master"]
 	remote = origin
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.idx b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.idx
new file mode 100644
index 00000000000..392a0da80da
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.idx differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.pack b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.pack
new file mode 100644
index 00000000000..8d39837e16b
Binary files /dev/null and b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/objects/pack/pack-6716438cb31b79ac3770f7b655f049426173d7d4.pack differ
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/packed-refs b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/packed-refs
new file mode 100644
index 00000000000..f8d9d96116e
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/packed-refs
@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd refs/remotes/origin/master
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/refs/heads/master b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/refs/heads/master
new file mode 100644
index 00000000000..2853a7db1bc
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/refs/heads/master
@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/shallow b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/shallow
new file mode 100644
index 00000000000..2853a7db1bc
--- /dev/null
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/ci/git/shallow_with_origin/repo/git/shallow
@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd