summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2020-06-04 19:54:43 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-06-04 10:58:26 -0700
commit53d69506c1108f5d4f7ac2fccd871946ff012071 (patch)
tree797c7c3610c635fb7a118cfe46a8e07ecb8cf6a0 /mergetools/winmerge
parentupload-pack: move filter_capability_requested to upload_pack_data (diff)
downloadtgif-53d69506c1108f5d4f7ac2fccd871946ff012071.tar.xz
upload-pack: move multi_ack to upload_pack_data
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data' more thoroughly, let's move the multi_ack static variable into this struct. It is only used by protocol v0 code since protocol v2 assumes certain baseline capabilities, but rolling it into upload_pack_data and just letting v2 code ignore it as it does now is more coherent and cleaner. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions