From f4609b896fac842433bd495c166d5987852a6a73 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 19:20:35 +0100 Subject: merge(3p/git): Merge git subtree at v2.29.2 This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb --- third_party/git/t/t5322-pack-objects-sparse.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'third_party/git/t/t5322-pack-objects-sparse.sh') diff --git a/third_party/git/t/t5322-pack-objects-sparse.sh b/third_party/git/t/t5322-pack-objects-sparse.sh index 7124b5581a0e..a581eaf52936 100755 --- a/third_party/git/t/t5322-pack-objects-sparse.sh +++ b/third_party/git/t/t5322-pack-objects-sparse.sh @@ -105,14 +105,16 @@ test_expect_success 'non-sparse pack-objects' ' test_cmp required_objects.txt nonsparse_required_objects.txt ' +# --sparse is enabled by default by pack.useSparse test_expect_success 'sparse pack-objects' ' + GIT_TEST_PACK_SPARSE=-1 && git rev-parse \ topic1 \ topic1^{tree} \ topic1:f3 \ topic1:f3/f4 \ topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt && - git pack-objects --stdout --revs --sparse sparse.pack && + git pack-objects --stdout --revs sparse.pack && git index-pack -o sparse.idx sparse.pack && git show-index sparse_objects.txt && test_cmp expect_sparse_objects.txt sparse_objects.txt -- cgit 1.4.1