git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Xidorn Quan <quanxunzhen@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3] credential-osxkeychain: support more protocols
Date: Sun, 02 Jun 2013 12:46:40 -0700	[thread overview]
Message-ID: <7vbo7onvmn.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1369973275-13353-1-git-send-email-quanxunzhen@gmail.com> (Xidorn Quan's message of "Fri, 31 May 2013 12:07:55 +0800")

Xidorn Quan <quanxunzhen@gmail.com> writes:

> Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.
>
> Signed-off-by: Xidorn Quan <quanxunzhen@gmail.com>
> Acked-by: John Szakmeister <john@szakmeister.net>
> Acked-by: Jeff King <peff@peff.net>
> ---

Hmph, I think I already have an identical copy in my tree.  Sent a
wrong patch?

>  contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> index 3940202..bcd3f57 100644
> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> @@ -127,10 +127,20 @@ static void read_credential(void)
>  		*v++ = '\0';
>  
>  		if (!strcmp(buf, "protocol")) {
> -			if (!strcmp(v, "https"))
> +			if (!strcmp(v, "imap"))
> +				protocol = kSecProtocolTypeIMAP;
> +			else if (!strcmp(v, "imaps"))
> +				protocol = kSecProtocolTypeIMAPS;
> +			else if (!strcmp(v, "ftp"))
> +				protocol = kSecProtocolTypeFTP;
> +			else if (!strcmp(v, "ftps"))
> +				protocol = kSecProtocolTypeFTPS;
> +			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);
>  		}

  reply	other threads:[~2013-06-02 19:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-31  4:07 [PATCH v3] credential-osxkeychain: support more protocols Xidorn Quan
2013-06-02 19:46 ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-05-27 14:35 [PATCH v2] " Xidorn Quan
2013-05-28  2:36 ` [PATCH v3] " Xidorn Quan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vbo7onvmn.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=quanxunzhen@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).