Re: [PATCH 1/6] repack: do not accidentally pack kept objects by default
- From
Jeff King <peff@peff.net>
- Date
- Jun 11, 2014, 06:32 UTC
- Message-ID
- <20140611063244.GA32333@sigill.intra.peff.net>
- In-Reply-To
- <20140610200837.GA14974@sigill.intra.peff.net>
On Tue, Jun 10, 2014 at 04:08:37PM -0400, Jeff King wrote:
> Note the update to t7700. It failed to turn on bitmaps, > meaning we were actually confirming the wrong behavior!
After writing this, I was thinking about the test, and why we didn't notice this regression. True, the test added to t7700 was checking the wrong thing. But the test _before_ it was trying to check the right thing, and still did not notice. It's because ee34a2b sabotaged it by adding an explicit --no-pack-kept-objects, so we were no longer testing the default behavior at all.
I think we should do something like this on top of the series I posted earlier. And possibly look into what kind of crack I was smoking when I wrote the original tests.
-- >8 -- Subject: t7700: drop explicit --no-pack-kept-objects from .keep test
We want to make sure that the default behavior of git-repack, without any options, continues to treat .keep files as it always has. Adding an explicit --no-pack-kept-objects, as ee34a2b did, is a much less interesting test, and prevented us from noticing the bug fixed by 64d3dc9 (repack: do not accidentally pack kept objects by default, 2014-06-10).
Signed-off-by: Jeff King <peff@peff.net> --- t/t7700-repack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 82d39ad..021c547 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -21,7 +21,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' ' objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 | sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") && mv pack-* .git/objects/pack/ && - git repack --no-pack-kept-objects -A -d -l && + git repack -A -d -l && git prune-packed && for p in .git/objects/pack/*.idx; do idx=$(basename $p)
-- 2.0.0.729.g520999f