summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-25 21:27:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-25 21:27:12 (GMT)
commit9db52cf44b63230ab5f1459b5109a437230c9a66 (patch)
tree6a1221a23acf54b5b9de1422091863e9bc362680 /t
parent58f34846d5858908b365011d17f1c552b4ad7fad (diff)
parent1c4a9f91142b2ca1b715e99b6e6da4016d422eb4 (diff)
downloadgit-9db52cf44b63230ab5f1459b5109a437230c9a66.zip
git-9db52cf44b63230ab5f1459b5109a437230c9a66.tar.gz
git-9db52cf44b63230ab5f1459b5109a437230c9a66.tar.bz2
Merge branch 'xl/record-partial-clone-origin' into maint
When creating a partial clone, the object filtering criteria is recorded for the origin of the clone, but this incorrectly used a hardcoded name "origin" to name that remote; it has been corrected to honor the "--origin <name>" option. * xl/record-partial-clone-origin: clone: respect user supplied origin name when setting up partial clone
Diffstat (limited to 't')
-rwxr-xr-xt/t5601-clone.sh16
1 files changed, 13 insertions, 3 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index de9d99c..37d7680 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -630,9 +630,8 @@ test_expect_success CASE_INSENSITIVE_FS 'colliding file detection' '
test_i18ngrep "the following paths have collided" icasefs/warning
'
-partial_clone () {
+partial_clone_server () {
SERVER="$1" &&
- URL="$2" &&
rm -rf "$SERVER" client &&
test_create_repo "$SERVER" &&
@@ -642,8 +641,14 @@ partial_clone () {
test_commit -C "$SERVER" two &&
HASH2=$(git hash-object "$SERVER/two.t") &&
test_config -C "$SERVER" uploadpack.allowfilter 1 &&
- test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 &&
+ test_config -C "$SERVER" uploadpack.allowanysha1inwant 1
+}
+partial_clone () {
+ SERVER="$1" &&
+ URL="$2" &&
+
+ partial_clone_server "${SERVER}" &&
git clone --filter=blob:limit=0 "$URL" client &&
git -C client fsck &&
@@ -660,6 +665,11 @@ test_expect_success 'partial clone' '
partial_clone server "file://$(pwd)/server"
'
+test_expect_success 'partial clone with -o' '
+ partial_clone_server server &&
+ git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client
+'
+
test_expect_success 'partial clone: warn if server does not support object filtering' '
rm -rf server client &&
test_create_repo server &&