summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-05 21:54:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-05 21:54:29 (GMT)
commitda05cacd8a4e7c3d6d8c84aa2c1d45684717ac95 (patch)
treebbe50f93a235441064fecf052b6123985c52ee51 /t
parent1d7e9c4c4e60375146ad70ed5c555574a653e92a (diff)
parent9a121b0d226dd0017318be0d18120aeb766f1235 (diff)
downloadgit-da05cacd8a4e7c3d6d8c84aa2c1d45684717ac95.zip
git-da05cacd8a4e7c3d6d8c84aa2c1d45684717ac95.tar.gz
git-da05cacd8a4e7c3d6d8c84aa2c1d45684717ac95.tar.bz2
Merge branch 'js/partial-urlmatch-2.17'
Recent updates broke parsing of "credential.<url>.<key>" where <url> is not a full URL (e.g. [credential "https://"] helper = ...) stopped working, which has been corrected. * js/partial-urlmatch-2.17: credential: handle `credential.<partial-URL>.<key>` again credential: optionally allow partial URLs in credential_from_url_gently() credential: fix grammar
Diffstat (limited to 't')
-rwxr-xr-xt/t0300-credentials.sh38
1 files changed, 38 insertions, 0 deletions
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index 91a007f..bc2d740 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -654,4 +654,42 @@ test_expect_success 'url parser not confused by encoded markers' '
"example.com#?/" foo.git
'
+test_expect_success 'credential config with partial URLs' '
+ echo "echo password=yep" | write_script git-credential-yep &&
+ test_write_lines url=https://user@example.com/repo.git >stdin &&
+ for partial in \
+ example.com \
+ user@example.com \
+ https:// \
+ https://example.com \
+ https://example.com/ \
+ https://user@example.com \
+ https://user@example.com/ \
+ https://example.com/repo.git \
+ https://user@example.com/repo.git \
+ /repo.git
+ do
+ git -c credential.$partial.helper=yep \
+ credential fill <stdin >stdout &&
+ grep yep stdout ||
+ return 1
+ done &&
+
+ for partial in \
+ dont.use.this \
+ http:// \
+ /repo
+ do
+ git -c credential.$partial.helper=yep \
+ credential fill <stdin >stdout &&
+ ! grep yep stdout ||
+ return 1
+ done &&
+
+ git -c credential.$partial.helper=yep \
+ -c credential.with%0anewline.username=uh-oh \
+ credential fill <stdin >stdout 2>stderr &&
+ test_i18ngrep "skipping credential lookup for key" stderr
+'
+
test_done