From: Clemens Buchacher <drizzd@aon.at>
Date: Wed, 4 Jan 2012 15:55:34 +0000 (+0100)
Subject: t5550: repack everything into one file
X-Git-Tag: v1.7.8.3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1327d83954bcf755094995b63317b23986c550f2;p=git.git

t5550: repack everything into one file

Subsequently we assume that there is only one pack. Currently this is
true only by accident. Pass '-a -d' to repack in order to guarantee that
assumption to hold true.

The prune-packed command is now redundant since repack -d already calls
it.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 311a33ca8..7926ab3c9 100755
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -118,8 +118,7 @@ test_expect_success 'http remote detects correct HEAD' '
 test_expect_success 'fetch packed objects' '
 	cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-	 git --bare repack &&
-	 git --bare prune-packed
+	 git --bare repack -a -d
 	) &&
 	git clone $HTTPD_URL/dumb/repo_pack.git
 '