On 2020-01-26 at 11:15:52, Johannes Schindelin wrote: > I would rather see this tested, still, and reducing the number of notes > that are retained from 50 to 20 before testing that the fanout has been > reduced to 0 seems to do the trick. Therefore, I would love to submit this > for squashing: > > -- snip -- > diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh > index 3520402bb81..39b12c9902c 100755 > --- a/t/t3305-notes-fanout.sh > +++ b/t/t3305-notes-fanout.sh > @@ -43,7 +43,7 @@ test_expect_success 'many notes created with git-notes triggers fanout' ' > ' > > test_expect_success 'deleting most notes with git-notes' ' > - num_notes=250 && > + num_notes=280 && > i=0 && > git rev-list HEAD | > while test $i -lt $num_notes && read sha1 > @@ -56,8 +56,8 @@ test_expect_success 'deleting most notes with git-notes' ' > ' > > test_expect_success 'most notes deleted correctly with git-notes' ' > - git log HEAD~250 | grep "^ " > output && > - i=50 && > + git log HEAD~280 | grep "^ " > output && > + i=20 && > while test $i -gt 0 > do > echo " commit #$i" && > @@ -67,7 +67,7 @@ test_expect_success 'most notes deleted correctly with git-notes' ' > test_cmp expect output > ' > > -test_expect_success SHA1 'deleting most notes triggers fanout consolidation' ' > +test_expect_success 'deleting most notes triggers fanout consolidation' ' > # Expect entire notes tree to have a fanout == 0 > git ls-tree -r --name-only refs/notes/commits | > while read path > -- snap -- Sure, that's a fine solution instead. I'll squash that in and update the commit message. I'll CC you for your sign-off once I've done that. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature