summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:57:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:57:14 -0700
commitfff948fe0e24d8f537b91c1de0349dc2e105dcd9 (patch)
treeaf687d705ee7bec7b2f20e8a7f65b4527b2dedbe /mergetools/meld
parentMerge branch 'jt/fetch-pack-in-vain-count-with-stateless' (diff)
parentident: handle NULL ai_canonname (diff)
downloadtgif-fff948fe0e24d8f537b91c1de0349dc2e105dcd9.tar.xz
Merge branch 'jk/ident-ai-canonname-could-be-null'
In the codepath that comes up with the hostname to be used in an e-mail when the user didn't tell us, we looked at ai_canonname field in struct addrinfo without making sure it is not NULL first. * jk/ident-ai-canonname-could-be-null: ident: handle NULL ai_canonname
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions