Merge branch 'ss/t3200-test-zero-oid'

gitster · gitster · commit 432282f9cbfb · 2026-03-19T09:54:55.000-07:00
A test now uses the symbolic constant $ZERO_OID instead of 40 "0" to
work better with SHA-256 as well as SHA-1.

* ss/t3200-test-zero-oid:
  t3200: replace hardcoded null OID with $ZERO_OID
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
@@ -1494,7 +1494,8 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
 '
 
 test_expect_success '--merged catches invalid object names' '
-	test_must_fail git branch --merged 0000000000000000000000000000000000000000
+	test_must_fail git branch --merged $ZERO_OID 2>err &&
+	test_grep "must point to a commit" err
 '
 
 test_expect_success '--list during rebase' '

Original file line number	Diff line number	Diff line change
`@@ -1494,7 +1494,8 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '`
`1494`	`1494`	`'`
`1495`	`1495`
`1496`	`1496`	`test_expect_success '--merged catches invalid object names' '`
`1497`		`- test_must_fail git branch --merged 0000000000000000000000000000000000000000`
	`1497`	`+ test_must_fail git branch --merged $ZERO_OID 2>err &&`
	`1498`	`+ test_grep "must point to a commit" err`
`1498`	`1499`	`'`
`1499`	`1500`
`1500`	`1501`	`test_expect_success '--list during rebase' '`