aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-02-26 18:10:24 -0800
committerJunio C Hamano <gitster@pobox.com>2024-02-26 18:10:24 -0800
commit225f892685e18b917d9827bb42e9533545a98b8e (patch)
tree857452fbf70c8e22c9a0948cd4b7c93886d56ab0
parent9f67cbd0a7725857d219da6720fc9a5acfda2960 (diff)
parent75389e275c288a328272b70e841ada767313a739 (diff)
downloadgit-225f892685e18b917d9827bb42e9533545a98b8e.tar.xz
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 fail
-rwxr-xr-xt/t9210-scalar.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t9210-scalar.sh b/t/t9210-scalar.sh
index 4432a30d10..428339e342 100755
--- a/t/t9210-scalar.sh
+++ b/t/t9210-scalar.sh
@@ -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 &&