summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2019-01-16 11:28:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-17 11:25:07 -0800
commitfbd76cd450e6675cbd5d48da3c53fa446b776475 (patch)
tree61be5a085f296813ac98dc99353057140bbefd0f /mergetools
parentpkt-line: introduce struct packet_writer (diff)
downloadtgif-fbd76cd450e6675cbd5d48da3c53fa446b776475.tar.xz
sideband: reverse its dependency on pkt-line
A subsequent patch will teach struct packet_reader a new field that, if set, instructs it to interpret read data as multiplexed. This will create a dependency from pkt-line to sideband. To avoid a circular dependency, split recv_sideband() into 2 parts: the reading loop (left in recv_sideband()) and the processing of the contents (in demultiplex_sideband()), and move the former into pkt-line. This reverses the direction of dependency: sideband no longer depends on pkt-line, and pkt-line now depends on sideband. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions