summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-04-24 11:49:52 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-29 08:37:36 -0700
commit9a121b0d226dd0017318be0d18120aeb766f1235 (patch)
tree04944a76b4e56059b833e564bce2db6e91780295 /contrib/examples/git-merge.sh
parentcredential: optionally allow partial URLs in credential_from_url_gently() (diff)
downloadtgif-9a121b0d226dd0017318be0d18120aeb766f1235.tar.xz
credential: handle `credential.<partial-URL>.<key>` again
In the patches for CVE-2020-11008, the ability to specify credential settings in the config for partial URLs got lost. For example, it used to be possible to specify a credential helper for a specific protocol: [credential "https://"] helper = my-https-helper Likewise, it used to be possible to configure settings for a specific host, e.g.: [credential "dev.azure.com"] useHTTPPath = true Let's reinstate this behavior. While at it, increase the test coverage to document and verify the behavior with a couple other categories of partial URLs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions