t5319: fix bogus cat-file argument
There's no such argument as "--unsorted"; it's spelled "--unordered". But our test failed to notice that cat-file didn't run at all because: 1. It lost the exit code of git on the left-hand side of a pipe. 2. It was comparing two runs of the broken invocation with and without a particular config variable (and indeed, both cases produced no output!). Let's fix the option, but also tweak the helper function to check the exit code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
4828ce9871
commit
b4a14394af
@ -86,13 +86,14 @@ test_expect_success 'write midx with one v1 pack' '
|
|||||||
'
|
'
|
||||||
|
|
||||||
midx_git_two_modes () {
|
midx_git_two_modes () {
|
||||||
|
git -c core.multiPackIndex=false $1 >expect &&
|
||||||
|
git -c core.multiPackIndex=true $1 >actual &&
|
||||||
if [ "$2" = "sorted" ]
|
if [ "$2" = "sorted" ]
|
||||||
then
|
then
|
||||||
git -c core.multiPackIndex=false $1 | sort >expect &&
|
sort <expect >expect.sorted &&
|
||||||
git -c core.multiPackIndex=true $1 | sort >actual
|
mv expect.sorted expect &&
|
||||||
else
|
sort <actual >actual.sorted &&
|
||||||
git -c core.multiPackIndex=false $1 >expect &&
|
mv actual.sorted actual
|
||||||
git -c core.multiPackIndex=true $1 >actual
|
|
||||||
fi &&
|
fi &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
}
|
}
|
||||||
@ -104,7 +105,7 @@ compare_results_with_midx () {
|
|||||||
midx_git_two_modes "log --raw" &&
|
midx_git_two_modes "log --raw" &&
|
||||||
midx_git_two_modes "count-objects --verbose" &&
|
midx_git_two_modes "count-objects --verbose" &&
|
||||||
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
|
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
|
||||||
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
|
midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unordered" sorted
|
||||||
'
|
'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user