averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

t4301: verify that merge-tree fails on missing blob objects

Browse Source 
We just fixed a problem where `merge-tree` would not fail on missing
tree objects. Let's ensure that that problem does not occur with blob
objects (and won't, in the future, either).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2024-02-23 08:34:22 +00:00
committed by Junio C Hamano
parent f30e6c32d8
commit 98c6d16d67
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t4301-merge-tree-write-tree.sh
View File

@@ -962,4 +962,20 @@ test_expect_success 'error out on missing tree objects' '
test_must_be_empty actual
'
test_expect_success 'error out on missing blob objects' '
echo 1 | git hash-object -w --stdin >blob1 &&
echo 2 | git hash-object -w --stdin >blob2 &&
echo 3 | git hash-object -w --stdin >blob3 &&
printf "100644 blob $(cat blob1)\tblob\n" | git mktree >tree1 &&
printf "100644 blob $(cat blob2)\tblob\n" | git mktree >tree2 &&
printf "100644 blob $(cat blob3)\tblob\n" | git mktree >tree3 &&
git init --bare missing-blob.git &&
cat blob1 blob3 tree1 tree2 tree3 |
git pack-objects missing-blob.git/objects/pack/side1-whatever-is-missing &&
test_must_fail git --git-dir=missing-blob.git >actual 2>err \
merge-tree --merge-base=$(cat tree1) $(cat tree2) $(cat tree3) &&
test_grep "unable to read blob object $(cat blob2)" err &&
test_must_be_empty actual
'
test_done