From: Jeff King <peff@peff.net>
Date: Wed, 11 Jun 2014 06:32:45 +0000 (-0400)
Subject: t7700: drop explicit --no-pack-kept-objects from .keep test
X-Git-Tag: v2.1.0-rc0~87^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d0174e38eed8143b1df0584a6c038fdaee5b89b?ds=inline;hp=--cc

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>
---

2d0174e38eed8143b1df0584a6c038fdaee5b89b
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 28f7135656..44407ae7c9 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)