Merge branch 'jc/t9210-lazy-fix'
Adjust use of "rev-list --missing" in an existing tests so that it does not depend on a buggy failure mode. * jc/t9210-lazy-fix: t9210: do not rely on lazy fetching to failmaint
commit
225f892685
|
@ -154,7 +154,14 @@ test_expect_success 'scalar clone' '
|
|||
test_cmp expect actual &&
|
||||
|
||||
test_path_is_missing 1/2 &&
|
||||
test_must_fail git rev-list --missing=print $second &&
|
||||
|
||||
# This relies on the fact that the presence of "--missing"
|
||||
# on the command line forces lazy fetching off before
|
||||
# "$second^{blob}" gets parsed. Without "^{blob}", a
|
||||
# bare object name "$second" is taken into the queue and
|
||||
# the command may not fail with a fixed "rev-list --missing".
|
||||
test_must_fail git rev-list --missing=print "$second^{blob}" -- &&
|
||||
|
||||
git rev-list $second &&
|
||||
git cat-file blob $second >actual &&
|
||||
echo "second" >expect &&
|
||||
|
|
Loading…
Reference in New Issue