diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:18 -0700 |
| commit | 07d872434dbddef6c361fb77ed232081c35dfd6c (patch) | |
| tree | d67f132eff5e84c6264c154fb1147ada05ff784f /t/t6037-merge-ours-theirs.sh | |
| parent | Sync with maint (diff) | |
| parent | connect: advertized capability is not a ref (diff) | |
| download | tgif-07d872434dbddef6c361fb77ed232081c35dfd6c.tar.xz | |
Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void'
JGit can show a fake ref "capabilities^{}" to "git fetch" when it
does not advertise any refs, but "git fetch" was not prepared to
see such an advertisement. When the other side disconnects without
giving any ref advertisement, we used to say "there may not be a
repository at that URL", but we may have seen other advertisement
like "shallow" and ".have" in which case we definitely know that a
repository is there. The code to detect this case has also been
updated.
* jt/accept-capability-advertisement-when-fetching-from-void:
connect: advertized capability is not a ref
connect: tighten check for unexpected early hang up
tests: move test_lazy_prereq JGIT to test-lib.sh
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions