diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:18 -0800 |
| commit | d31f3785dcc10459540e2e185b6e25363f719256 (patch) | |
| tree | 00b7dc87d8c3f9598bb5079b773999d1ff00dd32 /t | |
| parent | 3c1e0d6a79ed9028d165056afa24af9960dac688 (diff) | |
| parent | cf6672edb1eb90ef7f79d37eca08c93a662802a8 (diff) | |
| download | git-d31f3785dcc10459540e2e185b6e25363f719256.tar.gz git-d31f3785dcc10459540e2e185b6e25363f719256.tar.xz | |
Merge branch 'mh/war-on-extra-refs'
* mh/war-on-extra-refs:
refs: remove the extra_refs API
clone: do not add alternate references to extra_refs
everything_local(): mark alternate refs as complete
fetch-pack.c: inline insert_alternate_refs()
fetch-pack.c: rename some parameters from "path" to "refname"
clone.c: move more code into the "if (refs)" conditional
t5700: document a failure of alternates to affect fetch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5700-clone-reference.sh | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index c4c375ac0..bbc4691bd 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -52,13 +52,13 @@ test_cmp expected current' cd "$base_dir" -rm -f "$U" +rm -f "$U.D" test_expect_success 'cloning with reference (no -l -s)' \ -'GIT_DEBUG_SEND_PACK=3 git clone --reference B "file://$(pwd)/A" D 3>"$U"' +'GIT_DEBUG_SEND_PACK=3 git clone --reference B "file://$(pwd)/A" D 3>"$U.D"' test_expect_success 'fetched no objects' \ -'! grep "^want" "$U"' +'! grep "^want" "$U.D"' cd "$base_dir" @@ -153,4 +153,32 @@ test_expect_success 'clone with reference from a tagged repository' ' git clone --reference=A A I ' +test_expect_success 'prepare branched repository' ' + git clone A J && + ( + cd J && + git checkout -b other master^ && + echo other >otherfile && + git add otherfile && + git commit -m other && + git checkout master + ) +' + +rm -f "$U.K" + +test_expect_success 'fetch with incomplete alternates' ' + git init K && + echo "$base_dir/A/.git/objects" >K/.git/objects/info/alternates && + ( + cd K && + git remote add J "file://$base_dir/J" && + GIT_DEBUG_SEND_PACK=3 git fetch J 3>"$U.K" + ) && + master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) && + ! grep "^want $master_object" "$U.K" && + tag_object=$(cd A && git for-each-ref --format="%(objectname)" refs/tags/HEAD) && + ! grep "^want $tag_object" "$U.K" +' + test_done |