From: Siddharth Shrimali Date: Wed, 11 Mar 2026 10:58:10 GMT Subject: [PATCH] t3200: replace hardcoded null OID with $ZERO_OID Message-ID: <20260311105829.60508-1-r.siddharth.shrimali@gmail.com> Taking into consideration the SHA-256 transition, the test suite must be updated to support the length of the underlying hash algorithm. Tests that rely on hardcoded 40-character strings to represent the null object ID will fail when run in a SHA-256 environment, which expects a 64-character hash. Replace the hardcoded 40-zero string in the 'git branch --merged' test with the '$ZERO_OID' variable which is provided by the test framework. This ensures the test dynamically adapts to the correct null OID length and functions correctly regardless of the active hash algorithm. Signed-off-by: Siddharth Shrimali --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index c58e505c43..ed317a75f5 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1494,7 +1494,7 @@ 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 ' test_expect_success '--list during rebase' ' -- 2.51.2