aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-07 15:59:42 -0800
committerJunio C Hamano <gitster@pobox.com>2024-03-07 15:59:42 -0800
commita82fa7bce88e9795f18d01ed11df927e4de70ccf (patch)
tree13937fa62bccd96666c43a3aefcb6af937db2062 /builtin/merge-tree.c
parentMerge branch 'jk/upload-pack-bounded-resources' (diff)
parentupload-pack: only accept packfile-uris if we advertised it (diff)
downloadgit-a82fa7bce88e9795f18d01ed11df927e4de70ccf.tar.gz
git-a82fa7bce88e9795f18d01ed11df927e4de70ccf.zip
Merge branch 'jk/upload-pack-v2-capability-cleanup'
The upload-pack program, when talking over v2, accepted the packfile-uris protocol extension from the client, even if it did not advertise the capability, which has been corrected. * jk/upload-pack-v2-capability-cleanup: upload-pack: only accept packfile-uris if we advertised it upload-pack: use existing config mechanism for advertisement upload-pack: centralize setup of sideband-all config upload-pack: use repository struct to get config
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions