summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2018-05-03 16:46:56 -0700
committerJunio C Hamano <gitster@pobox.com>2018-05-06 13:17:19 +0900
commitba95710a3bdcb2a80495b1d93a0e482dd69905e1 (patch)
tree8336ff3d7af8a17c68a144edf627700643a457a2 /git-gui/lib/merge.tcl
parent5459268751941a71b32816902698376b7932cec5 (diff)
{fetch,upload}-pack: support filter in protocol v2
The fetch-pack/upload-pack protocol v2 was developed independently of the filter parameter (used in partial fetches), thus it did not include support for it. Add support for the filter parameter. Like in the legacy protocol, the server advertises and supports "filter" only if uploadpack.allowfilter is configured. Like in the legacy protocol, the client continues with a warning if "--filter" is specified, but the server does not advertise it. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions