Merge branch 'jc/subtree-reftable-testfix' into jch

gitster · gitster · commit e52e6d3a8733 · 2026-02-03T13:48:11.000-08:00
* jc/subtree-reftable-testfix:
  subtree: allow testing with reftable backend
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
@@ -1597,7 +1597,8 @@ test_expect_success 'push split to subproj' '
 
 test_expect_success 'subtree descendant check' '
 	subtree_test_create_repo "$test_count" &&
-	defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD") &&
+
+	defaultBranch=$(git -C "$test_count" symbolic-ref --short HEAD) &&
 	test_create_commit "$test_count" folder_subtree/a &&
 	(
 		cd "$test_count" &&

Original file line number	Diff line number	Diff line change
`@@ -1597,7 +1597,8 @@ test_expect_success 'push split to subproj' '`
`1597`	`1597`
`1598`	`1598`	`test_expect_success 'subtree descendant check' '`
`1599`	`1599`	`subtree_test_create_repo "$test_count" &&`
`1600`		`- defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD") &&`
	`1600`	`+`
	`1601`	`+ defaultBranch=$(git -C "$test_count" symbolic-ref --short HEAD) &&`
`1601`	`1602`	`test_create_commit "$test_count" folder_subtree/a &&`
`1602`	`1603`	`(`
`1603`	`1604`	`cd "$test_count" &&`