diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:24:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:24:23 -0800 |
| commit | 5ce2b97d2c2890e4ee1dd3bc936ea20d71f830ae (patch) | |
| tree | 369fb774d445e9bdbe25f8042fa2880eb3bece1a /t/t5500-fetch-pack.sh | |
| parent | 5e92376f8f70603e570f821267fc86c78175eb09 (diff) | |
| parent | 9049816140e75d3f7b15264e97e042f5ab0bf392 (diff) | |
| download | git-5ce2b97d2c2890e4ee1dd3bc936ea20d71f830ae.tar.gz | |
Merge branch 'nd/clone-detached'
* nd/clone-detached:
clone: fix up delay cloning conditions
push: do not let configured foreign-vcs permanently clobbered
clone: print advice on checking out detached HEAD
clone: allow --branch to take a tag
clone: refuse to clone if --branch points to bogus ref
clone: --branch=<branch> always means refs/heads/<branch>
clone: delay cloning until after remote HEAD checking
clone: factor out remote ref writing
clone: factor out HEAD update code
clone: factor out checkout code
clone: write detached HEAD in bare repositories
t5601: add missing && cascade
Diffstat (limited to 't/t5500-fetch-pack.sh')
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 7e85c71ad1..ce51692bb2 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -282,13 +282,6 @@ test_expect_success 'clone shallow object count' ' test_cmp count3.expected count3.actual ' -test_expect_success 'clone shallow with nonexistent --branch' ' - git clone --depth 1 --branch Z "file://$(pwd)/." shallow4 && - GIT_DIR=shallow4/.git git rev-parse HEAD >actual && - git rev-parse HEAD >expected && - test_cmp expected actual -' - test_expect_success 'clone shallow with detached HEAD' ' git checkout HEAD^ && git clone --depth 1 "file://$(pwd)/." shallow5 && @@ -318,4 +311,19 @@ EOF test_cmp count6.expected count6.actual ' +test_expect_success 'shallow cloning single tag' ' + git clone --depth 1 --branch=TAGB1 "file://$(pwd)/." shallow7 && + cat >taglist.expected <<\EOF && +TAGB1 +TAGB2 +EOF + GIT_DIR=shallow7/.git git tag -l >taglist.actual && + test_cmp taglist.expected taglist.actual && + + echo "in-pack: 7" > count7.expected && + GIT_DIR=shallow7/.git git count-objects -v | + grep "^in-pack" > count7.actual && + test_cmp count7.expected count7.actual +' + test_done |