On Mon, May 27, 2013 at 10:35:59PM +0800, Xidorn Quan wrote: > diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c > index 3940202..648fadd 100644 > --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c > +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c > @@ -127,10 +127,14 @@ static void read_credential(void) > *v++ = '\0'; > > if (!strcmp(buf, "protocol")) { > - if (!strcmp(v, "https")) > + if (!strcmp(v, "ftp")) > + protocol = kSecProtocolTypeFTP; > + else if (!strcmp(v, "https")) > protocol = kSecProtocolTypeHTTPS; > else if (!strcmp(v, "http")) > protocol = kSecProtocolTypeHTTP; > + else if (!strcmp(v, "smtp")) > + protocol = kSecProtocolTypeSMTP; > else /* we don't yet handle other protocols */ > exit(0); This looks good to me. Git will ask for "protocol=ftp" when accessing the dumb protocol over ftp. And it will ask for smtp via git-send-email since 4d31a44 (git-send-email: use git credential to obtain password, 2013-02-12). While we are in the area it may be worth thinking if there are other schemes we would want to support. Git might feed any URL scheme that curl accepts, so I think we would want to handle FTPS alongside FTP, no? We may also eventually want IMAP for git-imap-send, but we have not yet implemented credential-helper support there. We may also want http/socks proxy authentication, but we also have not implemented the git side of that yet. So I think both of those can wait for now. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html