git/contrib, branch v2.24.2

msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x

2020-01-16T20:18:23Z

With the upgrade, the library names changed from libeay32/ssleay32 to libcrypto/libssl. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'nr/diff-highlight-indent-fix'

2019-10-23T05:43:09Z

Code cleanup. * nr/diff-highlight-indent-fix: diff-highlight: fix a whitespace nit

Merge branch 'mb/clarify-zsh-completion-doc'

2019-10-23T05:43:09Z

The installation instruction for zsh completion script (in contrib/) has been a bit improved. * mb/clarify-zsh-completion-doc: completion: clarify installation instruction for zsh

completion: clarify installation instruction for zsh

2019-10-18T04:55:49Z

The original comment does not describe type of ~/.zsh/_git explicitly and zsh does not warn or fail if a user create it as a dictionary. So unexperienced users could be misled by the original comment. There is a small update to clarify it. Helped-by: Johannes Schindelin Helped-by: Junio C Hamano Signed-off-by: Maxim Belsky Signed-off-by: Junio C Hamano

diff-highlight: fix a whitespace nit

2019-10-15T05:08:37Z

This changes the indent from "" to "" so that the statement lines up with the rest of the block. Signed-off-by: Norman Rasmussen Acked-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ew/hashmap'

2019-10-15T04:48:02Z

Code clean-up of the hashmap API, both users and implementation. * ew/hashmap: hashmap_entry: remove first member requirement from docs hashmap: remove type arg from hashmap_{get,put,remove}_entry OFFSETOF_VAR macro to simplify hashmap iterators hashmap: introduce hashmap_free_entries hashmap: hashmap_{put,remove} return hashmap_entry * hashmap: use *_entry APIs for iteration hashmap_cmp_fn takes hashmap_entry params hashmap_get{,_from_hash} return "struct hashmap_entry *" hashmap: use *_entry APIs to wrap container_of hashmap_get_next returns "struct hashmap_entry *" introduce container_of macro hashmap_put takes "struct hashmap_entry *" hashmap_remove takes "const struct hashmap_entry *" hashmap_get takes "const struct hashmap_entry *" hashmap_add takes "struct hashmap_entry *" hashmap_get_next takes "const struct hashmap_entry *" hashmap_entry_init takes "struct hashmap_entry *" packfile: use hashmap_entry in delta_base_cache_entry coccicheck: detect hashmap_entry.hash assignment diff: use hashmap_entry_init on moved_entry.ent

Merge branch 'js/azure-pipelines-msvc'

2019-10-15T04:48:00Z

CI updates. * js/azure-pipelines-msvc: ci: also build and test with MS Visual Studio on Azure Pipelines ci: really use shallow clones on Azure Pipelines tests: let --immediate and --write-junit-xml play well together test-tool run-command: learn to run (parts of) the testsuite vcxproj: include more generated files vcxproj: only copy `git-remote-http.exe` once it was built msvc: work around a bug in GetEnvironmentVariable() msvc: handle DEVELOPER=1 msvc: ignore some libraries when linking compat/win32/path-utils.h: add #include guards winansi: use FLEX_ARRAY to avoid compiler warning msvc: avoid using minus operator on unsigned types push: do not pretend to return `int` from `die_push_simple()`

Merge branch 'am/visual-studio-config-fix'

2019-10-09T05:00:58Z

Dev support. * am/visual-studio-config-fix: contrib/buildsystems: fix Visual Studio Debug configuration

Merge branch 'cc/svn-fe-py-shebang'

2019-10-07T02:33:00Z

* cc/svn-fe-py-shebang: contrib/svn-fe: fix shebang for svnrdump_sim.py

Merge branch 'hb/hg-to-git-py3'

2019-10-07T02:32:59Z

The hg-to-git script (in contrib/) has been updated to work with Python 3. * hb/hg-to-git-py3: hg-to-git: make it compatible with both python3 and python2