aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-06-11 02:32:45 -0400
committerJunio C Hamano <gitster@pobox.com>2014-06-12 13:53:45 -0700
commit2d0174e38eed8143b1df0584a6c038fdaee5b89b (patch)
tree12f2f4179103a8fdacb0082d6e12232f9c2789ee /t
parent71d76cb48029c94af022ea9dc9c74b4ba8bcc3a3 (diff)
downloadgit-2d0174e38eed8143b1df0584a6c038fdaee5b89b.tar.gz
git-2d0174e38eed8143b1df0584a6c038fdaee5b89b.tar.xz
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7700-repack.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 28f713565..44407ae7c 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)