Merge branch 'js/partial-urlmatch'
commit568324f31ba6cec13532e420117d312db65ddd80
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 May 2020 21:54:29 +0000 (5 14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 May 2020 21:54:30 +0000 (5 14:54 -0700)
tree749064792c8d2f6e22e932c165373839cef17803
parentda05cacd8a4e7c3d6d8c84aa2c1d45684717ac95
parentcd93e6c029026cc3da466ddc53927e85b7e7041e
Merge branch 'js/partial-urlmatch'

The same as js/partial-urlmatch-2.17, built on more recent codebase
to avoid unnecessary merge conflicts.

* js/partial-urlmatch:
  credential: handle `credential.<partial-URL>.<key>` again
  credential: optionally allow partial URLs in credential_from_url_gently()
credential.c