summaryrefslogtreecommitdiff
path: root/t/t5550-http-fetch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-04 19:21:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-04 19:21:42 (GMT)
commit247f9d23da8cfd255533433ad2aa07d172afac0b (patch)
treeb004483b600ed0a4b0e69396544bbe28081ee1ba /t/t5550-http-fetch.sh
parent4570aeb0d85f3b5ff274b6d5a651c2ee06d25d76 (diff)
parent1327d83954bcf755094995b63317b23986c550f2 (diff)
downloadgit-247f9d23da8cfd255533433ad2aa07d172afac0b.zip
git-247f9d23da8cfd255533433ad2aa07d172afac0b.tar.gz
git-247f9d23da8cfd255533433ad2aa07d172afac0b.tar.bz2
Merge branch 'maint'
* maint: t5550: repack everything into one file Catch invalid --depth option passed to clone or fetch
Diffstat (limited to 't/t5550-http-fetch.sh')
-rwxr-xr-xt/t5550-http-fetch.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 95a133d..e5e6b8f 100755
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -162,8 +162,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
'