summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-11 12:48:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-11 12:48:29 -0700
commit4ac01b0cbc27b314333362e77323850e78a7448c (patch)
tree7f99def2b5c3bfe2973139de2c801862c6949f44 /t
parentMerge branch 'jc/rev-list-simplify-merges-first-parent' into maint (diff)
parentclone: fix ref selection in --single-branch --branch=xxx (diff)
downloadtgif-4ac01b0cbc27b314333362e77323850e78a7448c.tar.xz
Merge branch 'nd/clone-single-fix' into maint
"git clone --single-branch" to clone a single branch did not limit the cloning to the specified branch. * nd/clone-single-fix: clone: fix ref selection in --single-branch --branch=xxx
Diffstat (limited to 't')
-rwxr-xr-xt/t5500-fetch-pack.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 1d1ca98588..e80a2af348 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -125,6 +125,11 @@ test_expect_success 'single branch object count' '
test_cmp expected count.singlebranch
'
+test_expect_success 'single given branch clone' '
+ git clone --single-branch --branch A "file://$(pwd)/." branch-a &&
+ test_must_fail git --git-dir=branch-a/.git rev-parse origin/B
+'
+
test_expect_success 'clone shallow' '
git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow
'
@@ -276,7 +281,7 @@ test_expect_success 'clone shallow with --branch' '
'
test_expect_success 'clone shallow object count' '
- echo "in-pack: 12" > count3.expected &&
+ echo "in-pack: 6" > count3.expected &&
GIT_DIR=shallow3/.git git count-objects -v |
grep "^in-pack" > count3.actual &&
test_cmp count3.expected count3.actual