summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-08-03 18:56:57 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-04 13:33:27 -0700
commitc81539b5f6f608ec48358ca6a35f7323e96432e1 (patch)
tree6ef4b02d1f0c984d7f84796826dca4eb856ebf8b /xdiff/xmerge.c
parentNinth batch of topics for 2.10 (diff)
downloadtgif-c81539b5f6f608ec48358ca6a35f7323e96432e1.tar.xz
trace: handle NULL argument in trace_disable()
All of the trace functions treat a NULL key as a synonym for the default GIT_TRACE key. Except for trace_disable(), which will segfault. Fortunately, this can't cause any bugs, as the function has no callers. But rather than drop it, let's fix the bug, as I plan to add a caller. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions