diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:37:41 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 21:37:41 (GMT) |
commit | 0fb2c97c206958a13e8979187b7b3cc31d389126 (patch) | |
tree | 83687d7743812157c37fd644127ba47844f441f3 /t | |
parent | 11fbc0b1e1d5435f482af7bf391fd0d679955ba6 (diff) | |
parent | 71d5f938910120275484aac0b2e1c27cdf8b5cf3 (diff) | |
download | git-0fb2c97c206958a13e8979187b7b3cc31d389126.zip git-0fb2c97c206958a13e8979187b7b3cc31d389126.tar.gz git-0fb2c97c206958a13e8979187b7b3cc31d389126.tar.bz2 |
Merge branch 'mh/fetch-into-shallow' into maint
* mh/fetch-into-shallow:
t5500: add test for fetching with an unknown 'shallow'
upload-pack: ignore 'shallow' lines with unknown obj-ids
Diffstat (limited to 't')
-rwxr-xr-x | t/t5500-fetch-pack.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index d574085..6133d9e 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -373,6 +373,20 @@ test_expect_success 'clone shallow with packed refs' ' test_cmp count8.expected count8.actual ' +test_expect_success 'fetch in shallow repo unreachable shallow objects' ' + ( + git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog && + git clone --depth 1 "file://$(pwd)/no-reflog" shallow9 && + cd no-reflog && + git tag -d TAGB1 TAGB2 && + git update-ref refs/heads/B B~~ && + git gc --prune=now && + cd ../shallow9 && + git fetch origin && + git fsck --no-dangling + ) +' + test_expect_success 'setup tests for the --stdin parameter' ' for head in C D E F do |