diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:21 -0700 |
| commit | a0125885f544a670cfe5cf307a2feabba7e3bf9c (patch) | |
| tree | 407fe70a48af5187722492c21f0e301e631d5a0a /builtin/merge-ours.c | |
| parent | Merge branch 'ds/sparse-updates-oob-access-fix' (diff) | |
| parent | upload-pack: clear filter_options for each v2 fetch command (diff) | |
| download | tgif-a0125885f544a670cfe5cf307a2feabba7e3bf9c.tar.xz | |
Merge branch 'cc/upload-pack-v2-fetch-fix'
Serving a "git fetch" client over "git://" and "ssh://" protocols
using the on-wire protocol version 2 was buggy on the server end
when the client needs to make a follow-up request to
e.g. auto-follow tags.
* cc/upload-pack-v2-fetch-fix:
upload-pack: clear filter_options for each v2 fetch command
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions