diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-19 09:54:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-19 09:54:55 -0700 |
| commit | 432282f9cbfbc16dcb77c400050ba8bc8c34b771 (patch) | |
| tree | 379cff7f718ec45e0a9e5c8ddf42192f18e90f3c /t | |
| parent | 17b9c759bd5d3407f573bb2a6a78d81e94b51c39 (diff) | |
| parent | 30310f3cc474ff26b8306da48566667f67206808 (diff) | |
| download | git-432282f9cbfbc16dcb77c400050ba8bc8c34b771.tar.xz | |
Merge branch 'ss/t3200-test-zero-oid'
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index c58e505c43..e7829c2c4b 100755 --- 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' ' |