• Kirill Smelkov's avatar
    pull: test: Update expected error for "missing blob in pack" for Git ≥ 2.31 · 3230197c
    Kirill Smelkov authored
    Starting from the same https://git.kernel.org/pub/scm/git/git.git/commit/?id=5476e1efded5
    (see previous patch) git changed output when reporting error about a bad
    pack. Before that patch it was something like
    
            $ git -c fetch.fsckObjects=true fetch-pack --thin --upload-pack=git -c uploadpack.allowAnySHA1InWant=true -c uploadpack.allowTipSHA1InWant=true -c uploadpack.allowReachableSHA1InWant=true upload-pack /home/kirr/src/neo/src/lab.nexedi.com/kirr/git-backup/testdata/3/incomplete-send-pack.git 46094318d7ea2dab446294556097361409ca1e84 </dev/null
            warning: no common commits
            remote: I: x-missing-blob/hook-pack-object is running ...
            remote: Enumerating objects: 4, done.
    remote: Counting objects: 100% (4/4), done.
    remote: Compressing objects: 100% (3/3), done.
            remote: Total 4 (delta 1), reused 0 (delta 0)
            fatal: object of unexpected type                               <-- NOTE
            fatal: unpack-objects failed                                   <-- NOTE
    
    and after the patch it became
    
            $ git -c fetch.fsckObjects=true fetch-pack --thin --upload-pack=git -c uploadpack.allowAnySHA1InWant=true -c uploadpack.allowTipSHA1InWant=true -c uploadpack.allowReachableSHA1InWant=true upload-pack /home/kirr/src/neo/src/lab.nexedi.com/kirr/git-backup/testdata/3/incomplete-send-pack.git 46094318d7ea2dab446294556097361409ca1e84 </dev/null
            remote: I: x-missing-blob/hook-pack-object is running ...
            remote: Enumerating objects: 4, done.
    remote: Counting objects: 100% (4/4), done.
    remote: Compressing objects: 100% (3/3), done.
            remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
    Receiving objects: 100% (4/4), 377 bytes | 377.00 KiB/s, done.
    Resolving deltas: 100% (1/1), done.)
            fatal: did not receive expected object 737592d2855213009bd3fa689167fe9a8363e45f         <-- NOTE
            fatal: index-pack failed                                                                <-- NOTE
    
    -> Adjust the test to detect the second case as also ok to avoid failing
    tests with Git ≥ 2.31.
    3230197c