git/contrib, branch v2.25.2

Sync with maint

2020-01-16T23:18:46Z

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

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 'dl/pretty-reference'

2019-12-10T21:11:43Z

"git log" family learned "--pretty=reference" that gives the name of a commit in the format that is often used to refer to it in log messages. * dl/pretty-reference: SubmittingPatches: use `--pretty=reference` pretty: implement 'reference' format pretty: add struct cmt_fmt_map::default_date_mode_type pretty: provide short date format t4205: cover `git log --reflog -z` blindspot pretty.c: inline initalize format_context revision: make get_revision_mark() return const pointer completion: complete `tformat:` pretty format SubmittingPatches: remove dq from commit reference pretty-formats.txt: use generic terms for hash SubmittingPatches: use generic terms for hash

Merge branch 'dl/submodule-set-url'

2019-12-10T21:11:42Z

"git submodule" learned a subcommand "set-url". * dl/submodule-set-url: submodule: teach set-url subcommand

Merge branch 'js/complete-svn-recursive'

2019-12-01T17:04:40Z

The completion script (in contrib/) has been taught that "git svn" supports the "--recursive" option. * js/complete-svn-recursive: completion: tab-complete "git svn --recursive"

Merge branch 'dl/complete-rebase-onto'

2019-12-01T17:04:37Z

The completion script (in contrib/) learned that the "--onto" option of "git rebase" can take its argument as the value of the option. * dl/complete-rebase-onto: completion: learn to complete `git rebase --onto=`

Merge branch 'jk/remove-sha1-to-hex'

2019-12-01T17:04:36Z

Code clean-up. * jk/remove-sha1-to-hex: hex: drop sha1_to_hex() hex: drop sha1_to_hex_r()

pretty: implement 'reference' format

2019-11-20T04:33:37Z

The standard format for referencing other commits within some projects (such as git.git) is the reference format. This is described in Documentation/SubmittingPatches as If you want to reference a previous commit in the history of a stable branch, use the format "abbreviated hash (subject, date)", like this: .... Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) noticed that ... .... Since this format is so commonly used, standardize it as a pretty format. The tests that are implemented essentially show that the format-string does not change in response to various log options. This is useful because, for future developers, it shows that we've considered the limitations of the "canned format-string" approach and we are fine with them. Based-on-a-patch-by: SZEDER Gábor Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

completion: complete `tformat:` pretty format

2019-11-20T04:33:36Z

Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

completion: tab-complete "git svn --recursive"

2019-11-13T03:46:12Z

Signed-off-by: James Shubin Signed-off-by: Junio C Hamano