From: Junio C Hamano <gitster@pobox.com>
To: Andrew Carter <andrew@emailcarter.com>
Cc: git@vger.kernel.org, "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v2] docs: indicate http.sslCertType and sslKeyType
Date: Thu, 30 Jan 2025 14:22:26 -0800 [thread overview]
Message-ID: <xmqqa5b8aqn1.fsf@gitster.g> (raw)
In-Reply-To: <dd5d9b93-1585-4165-8f5d-d9737725071e@emailcarter.com> (Andrew Carter's message of "Thu, 30 Jan 2025 07:18:08 -0600")
Andrew Carter <andrew@emailcarter.com> writes:
> 0a01d41ee4 (http: add support for different sslcert and sslkey types.,
> 2023-03-20) added useful SSL config options, but did not document them.
>
> Signed-off-by: Andrew Carter <andrew@emailcarter.com>
> ---
> Documentation/config/http.txt | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
warning: Patch sent with format=flowed; space at the end of lines might be lost.
error: corrupt patch at line 10
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: docs: indicate http.sslCertType and sslKeyType
Patch failed at 0001 docs: indicate http.sslCertType and sslKeyType
I thought that the initial iteration I received from you on Jan 23rd
was just fine. Did you change some settings with your MUA? The patch
is heavily whitespace damaged, with full of .
> diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
> index a14371b5c9..38e874307b 100644
> --- a/Documentation/config/http.txt
> +++ b/Documentation/config/http.txt
> @@ -216,6 +216,21 @@ http.sslBackend::
> This option is ignored if cURL lacks support for choosing the SSL
> backend at runtime.
>
> +http.sslCertType::
> + Type of client certificate used when fetching or pushing over HTTPS.
> + "PEM", "DER" are supported when using openssl or gnutls backends. "P12"
> + is supported on "openssl", "schannel", "securetransport", and
> gnutls 8.11+.
> + See also libcurl `CURLOPT_SSLCERTTYPE`. Can be overridden by the
> + `GIT_SSL_CERT_TYPE` environment variable.
> +
> +http.sslKeyType::
> + Type of client private key used when fetching or pushing over
> HTTPS. (e.g.
> + "PEM", "DER", or "ENG"). Only applicable when using "openssl"
> backend. "DER"
> + is not supported with openssl. Particularly useful when set to
> "ENG" for
> + authenticating with PKCS#11 tokens, with a PKCS#11 URL in sslCert
> option.
> + See also libcurl `CURLOPT_SSLCERTTYPE`. Can be overridden by the
> + `GIT_SSL_KEY_TYPE` environment variable.
> +
> http.schannelCheckRevoke::
> Used to enforce or disable certificate revocation checks in cURL
> when http.sslBackend is set to "schannel". Defaults to `true` if
next prev parent reply other threads:[~2025-01-30 22:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 0:16 [PATCH] docs: indicate http.sslCertType and sslKeyType Andrew Carter via GitGitGadget
2025-01-23 0:34 ` brian m. carlson
2025-01-23 17:43 ` Junio C Hamano
2025-01-25 6:38 ` Andrew Carter
2025-01-30 13:18 ` [PATCH v2] " Andrew Carter
2025-01-30 22:22 ` Junio C Hamano [this message]
2025-02-05 5:46 ` Andrew Carter
2025-02-05 17:45 ` Junio C Hamano
2025-02-05 5:38 ` Andrew Carter
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa5b8aqn1.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andrew@emailcarter.com \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.