global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-12 18:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

t3200: replace hardcoded null OID with $ZERO_OID

Browse Source 
To support the SHA-256 transition, replace the hardcoded 40-zero string
in 'git branch --merged' with '$ZERO_OID'. The current 40-character
string causes the test to fail prematurely in SHA-256 environments
because Git identifies a "malformed object name" (due to the 40 vs 64
character mismatch) before it even validates the object type.

By using '$ZERO_OID', we ensure the hash length is always correct for
the active algorithm. Additionally, use 'test_grep' to verify the
"must point to a commit" error message, ensuring the test validates
the object type logic rather than just string syntax.

Suggested-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Siddharth Shrimali <r.siddharth.shrimali@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Siddharth Shrimali
2026-03-11 23:11:20 +05:30
committed by Junio C Hamano
parent 67ad42147a
commit 30310f3cc4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/t3200-branch.sh
View File

@@ -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' '