| Message ID | 35038dfd037f6da1e21c1d9f1a24b27cb7100598.1611060724.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3cf5f221bec9cefcb472e71e2cf378aecbb6f33f |
| Headers | show |
| Series | Two cleanups around 'prefetch' refs | expand |
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Derrick Stolee <dstolee@microsoft.com> > > The tests for the 'prefetch' task create remotes and fetch refs into > 'refs/prefetch/<remote>/' and tags into 'refs/tags/'. These tests use > the remotes to create objects not intended to be seen by the "local" > repository. > > In that sense, the incrmental-repack tasks did not have these objects > and refs in mind. That test replaces the object directory with a > specific pack-file layout for testing the batch-size logic. However, > this causes some operations to start showing warnings such as: > > error: refs/prefetch/remote1/one does not point to a valid object! > error: refs/tags/one does not point to a valid object! So we use prefetch refs but craft a repacking strategy in such a way that these prefetch refs do not act as anchors, deliberately breaking the repository and invalidating the prefetch refs so to speak? Wow, that sounds like an evil and brittle test set-up. > This only shows up if you run the tests verbosely and watch the output. > It caught my eye and I _thought_ that there was a bug where 'git gc' or > 'git repack' wouldn't check 'refs/prefetch/' before pruning objects. > That is incorrect. Those commands do handle 'refs/prefetch/' correctly. > All that is left is to clean up the tests in t7900-maintenance.sh to > remove these tags and refs that are not being repacked for the > incremental-repack tests. Use update-ref to ensure this works with all > ref backends. > > Helped-by: Taylor Blau <me@ttaylorr.com> > Signed-off-by: Derrick Stolee <dstolee@microsoft.com> > --- > t/t7900-maintenance.sh | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh > index f9031cbb44b..78ccf4b33f8 100755 > --- a/t/t7900-maintenance.sh > +++ b/t/t7900-maintenance.sh > @@ -256,6 +256,13 @@ test_expect_success 'incremental-repack task' ' > HEAD > ^HEAD~1 > EOF > + > + # Delete refs that have not been repacked in these packs. > + git for-each-ref --format="delete %(refname)" \ > + refs/prefetch refs/tags >refs && > + git update-ref --stdin <refs && > + > + # Replace the object directory with this pack layout. > rm -f $packDir/pack-* && > rm -f $packDir/loose-* && > ls $packDir/*.pack >packs-before &&
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index f9031cbb44b..78ccf4b33f8 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -256,6 +256,13 @@ test_expect_success 'incremental-repack task' ' HEAD ^HEAD~1 EOF + + # Delete refs that have not been repacked in these packs. + git for-each-ref --format="delete %(refname)" \ + refs/prefetch refs/tags >refs && + git update-ref --stdin <refs && + + # Replace the object directory with this pack layout. rm -f $packDir/pack-* && rm -f $packDir/loose-* && ls $packDir/*.pack >packs-before &&