DataDog · gh-worker-dd-mergequeue-cf854d · Mar 13, 2026 · Mar 12, 2026 · Mar 13, 2026
@@ -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"() {

@@ -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"
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true
@@ -0,0 +1 @@
+x+)JMU044d040031QHËÌI5Ð+©(a8}Ádòámr[WwEùm,ÒÈíFRdV´ÕÏSÃákÑ.í/=h^¿ã"#°"_ïÇë÷hæÚrÝgGÑÔKÏ.Ï
@@ -0,0 +1 @@
+xM0{ö¯ð}µ¶ñR[oXÚHÚÜ²â$°mÄ¯/l®=u¤ÞyFój4JÃë©I?L7¥ )j\QD9Å¤©%¶gÒ$B3ÎQIÖb¼©ó-Ëâ¬4E1%ÂDT¸Ü¬jn	qÃ(qÉ|ús5NÐ~èOÓR<?_Õ]^}¬ôð"Î	!0d`¡ËúoöÒ¯-|^ÃñÃ8YÁ,S;/~øïÀ¥qaô½ÆvI/YÕ¦"©Þìw]r*Pw+k³ò>¡5MÁª¨î'ÎæüÒß°:§®(®y`¬Þ÷ïb-lû0ËÐ_ÜâE;ùJ\ÎÒEýÁQûÀn}°ëû_]\çSt<?H3ÏÙl6zrÒï¶zGI×Çè ð{êo¿ù\(ÜgVxg)'»>µ×Qê{«?Ç9üÔû×1ûxA£l¤à/V¤}
@@ -0,0 +1,2 @@
+xM0{ö¯ð=ÚÆÁi[ðv³@å¶IÓH	IS~}asÝSGég4¯F£m]{h,O}§¨D¨°8[jÁ93¤ÁÅ¸ +ÓTp.:ÕôÐD	bQÃ¨¬Ä,²*Ì
+Á¹,!BÅµÿÙv0SÚýÜÅÓ£ñMÝú¬ÕgÑÖ_!6MJ)¦ÃÂköê¿çÃåxOS,½ J`0ÄÎò7ïã$Êí)6cºñ¤Ö&íúÇöÿÊq&vHÃÔAXuP¥Q¹çLÒÏW§Ëu³ÒQMâðüwæ£iÂÝý.¦Â¶÷Cx£[4êe6&Cá`½w#dàD7îkÕÌô-3Éõ|wfa+ïÊOî)~ïÌv[ÅùUÝ[uüþ¤ÏÀy_nnåkg¨~óç/»teó/àq/q?:p¯Q«Ë¥8(ÈÀ?!Ó¥0

@@ -0,0 +1,3 @@
+xMo@{Þ_±÷(í~²VÅc³RÊÔÜXh
+bp>üëñ5§4Ò;Ïh^FSô]÷4AÎøéh-DÌÅUîRs^3çb$æ¹´RWTÁíaØH:.áJ°d3!sdIá0,IY8ÄÇæ4ýéPÛqÞEßLsq}iü´o¦Zûµè»A)ÅÔqáÂÎkNö¿ê¡jx½Ä*#d(TNÀ«(EíÖ[â~N?^Ô® ªß=>4ñßÇºYX\´¡	Ý.¬(Ï¤SlËMzÛüpµ;Ü¶Gbj-Óg½AËöC,çeg³[4ë^Èª³Yã6ó#¬tÀ\è½oÕÝ~
+åEºbÍÝfx/Þ_ý}öi¯úÎÙtdÏtsûbC¯LÐ¸3áü\¡æôíJg§pª£ïàr@ù¬/¯ÑÙq4µütÎ¤~

@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
@@ -0,0 +1 @@
+ref: refs/heads/master
@@ -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

@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd refs/remotes/origin/master
@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
@@ -0,0 +1 @@
+c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		x+)JMU044d040031QHËÌI5Ð+©(a8}Ádòámr[WwEùm,ÒÈíFRdV´ÕÏSÃákÑ.í/=h^¿ã"#°"_ïÇë÷hæÚrÝgGÑÔKÏ.Ï
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		xM0{ö¯ð}µ¶ñR[oXÚHÚÜ²â$°mÄ¯/l®=u¤ÞyFój4JÃë©I?L7¥ )j\QD9Å¤©%¶gÒ$B3ÎQIÖb¼©ó-Ëâ¬4E1%ÂDT¸Ü¬jn qÃ(qÉ\|ús5NÐ~èOÓR<?_Õ]^}¬ôð"Î !0d`¡ËúoöÒ¯-\|^ÃñÃ8YÁ,S;/~øïÀ¥qaô½ÆvI/YÕ¦"©Þìw]r*Pw+k³ò>¡5MÁª¨î'ÎæüÒß°:§®(®y`¬Þ÷ïb-lû0ËÐ_ÜâE;ùJ\ÎÒEýÁQûÀn}°ëû_]\çSt<?H3ÏÙl6zrÒï¶zGI×Çè ð{êo¿ù\(ÜgVxg)'»>µ×Qê{«?Ç9üÔû×1ûxA£l¤à/V¤}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		xM0{ö¯ð=ÚÆÁi[ðv³@å¶IÓH IS~}asÝSGég4¯F£m]{h,O}§¨D¨°8[jÁ93¤ÁÅ¸ +ÓTp.:ÕôÐD bQÃ¨¬Ä,²*Ì
		Á¹,!BÅµÿÙv0SÚýÜÅÓ£ñMÝú¬ÕgÑÖ_!6MJ)¦ÃÂköê¿çÃåxOS,½ J`0ÄÎò7ïã$Êí)6cºñ¤Ö&íúÇöÿÊq&vHÃÔAXuP¥Q¹çLÒÏW§Ëu³ÒQMâðüwæ£iÂÝý.¦Â¶÷Cx£[4êe6&Cá`½w#dàD7îkÕÌô-3Éõ\|wfa+ïÊOî)~ïÌv[ÅùUÝ[uüþ¤ÏÀy_nnåkg¨~óç/»teó/àq/q?:p¯Q«Ë¥8(ÈÀ?!Ó¥0
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# pack-refs with: peeled fully-peeled sorted
		c76ef954d23f8fdb42dcf2fe956d6af5a31fe7bd refs/remotes/origin/master