aboutsummaryrefslogtreecommitdiff
path: root/credential.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:33 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:33 -0700
commit9837911c139cefae24c7bc68751cd1cfdc950554 (patch)
tree007d5c9ef1f3b4c40955967ecb7d7fc12683bab1 /credential.c
parent331eb92bbcbb114ff07d0b0a7b78dae9d0a75f4c (diff)
parent77eab053a48a2062665c42f63348ae12290de03f (diff)
downloadgit-9837911c139cefae24c7bc68751cd1cfdc950554.tar.xz
Merge branch 'jk/mediawiki-credential'
* jk/mediawiki-credential: mw-to-git: use git-credential's URL parser credential: convert "url" attribute into its parsed subparts mw-to-git: check blank credential attributes via length docs/credential: minor clarity fixups
Diffstat (limited to 'credential.c')
-rw-r--r--credential.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/credential.c b/credential.c
index 2c400073fa..e54753c75d 100644
--- a/credential.c
+++ b/credential.c
@@ -172,6 +172,8 @@ int credential_read(struct credential *c, FILE *fp)
} else if (!strcmp(key, "path")) {
free(c->path);
c->path = xstrdup(value);
+ } else if (!strcmp(key, "url")) {
+ credential_from_url(c, value);
}
/*
* Ignore other lines; we don't know what they mean, but