diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-14 22:23:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-14 22:23:18 (GMT) |
| commit | 07198afbd19f5ba4f991d9b554bc320690de19dc (patch) | |
| tree | af4a70e09a97335a1b5db7ce0f61f179c47f905b /t/t5516-fetch-push.sh | |
| parent | c809496c97122b7d297e7216c3bfff7262b212e0 (diff) | |
| parent | d56583ded679f2eade3994d855c8d605e2964710 (diff) | |
| download | git-07198afbd19f5ba4f991d9b554bc320690de19dc.zip git-07198afbd19f5ba4f991d9b554bc320690de19dc.tar.gz git-07198afbd19f5ba4f991d9b554bc320690de19dc.tar.bz2 | |
Merge branch 'mm/fetch-show-error-message-on-unadvertised-object'
"git fetch" that requests a commit by object name, when the other
side does not allow such an request, failed without much
explanation.
* mm/fetch-show-error-message-on-unadvertised-object:
fetch-pack: add specific error for fetching an unadvertised object
fetch_refs_via_pack: call report_unmatched_refs
fetch-pack: move code to report unmatched refs to a function
Diffstat (limited to 't/t5516-fetch-push.sh')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 0fc5a7c..177897e 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1098,7 +1098,8 @@ test_expect_success 'fetch exact SHA1' ' test_must_fail git cat-file -t $the_commit && # fetching the hidden object should fail by default - test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy && + test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err && + test_i18ngrep "Server does not allow request for unadvertised object" err && test_must_fail git rev-parse --verify refs/heads/copy && # the server side can allow it to succeed |