summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Carlo Marcelo Arenas Belón <carenas@gmail.com>2021-09-15 01:09:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-16 20:47:23 -0700
commitbffcb4d9d6394a68a7f6c03598087705c6d34510 (patch)
treeb0f7c93d815ea351888dc6bf7c19a1cb2721ae28 /Documentation/git-mergetool.txt
parentgit-cvsserver: use crypt correctly to compare password hashes (diff)
downloadtgif-bffcb4d9d6394a68a7f6c03598087705c6d34510.tar.xz
git-cvsserver: protect against NULL in crypt(3)
Some versions of crypt(3) will return NULL when passed an unsupported hash type (ex: OpenBSD with DES), so check for undef instead of using it directly. Also use this to probe the system and select a better hash function in the tests, so it can pass successfully. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> [jc: <CAPUEspjqD5zy8TLuFA96usU7FYi=0wF84y7NgOVFqegtxL9zbw@mail.gmail.com>] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions