From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/2] credential: handle partial URLs in config settings again (master)
Date: Fri, 24 Apr 2020 22:35:47 +0000 [thread overview]
Message-ID: <pull.620.git.1587767749.gitgitgadget@gmail.com> (raw)
This is a companion patch to https://github.com/gitgitgadget/git/pull/615,
but targets maint instead of maint-2.17: There is not really a good way to
get those patches into maint by merging because the final patch looks quite
a bit different by necessity (after 46fd7b390034 (credential: allow wildcard
patterns when matching config, 2020-02-20) the urlmatch machinery is
supposed to handle credential.<url>.* config parsing).
IMHO the easiest strategy would be to apply these patches on top of maint,
then merge the other patches on top of maint-2.17 with -s ours.
Note: typically I do not send GitGitGadget PRs before the builds finished,
just in case that I did something really stupid that breaks plenty of tests.
However, in this case, I figure that y'all want to see them patches early,
and I can't wait for the build to finish because I need to get some rest,
like, right now.
Johannes Schindelin (2):
credential: optionally allow partial URLs in
credential_from_url_gently()
credential: handle `credential.<partial-URL>.<key>` again
credential.c | 69 ++++++++++++++++++++++++++++++++++++++----
t/t0300-credentials.sh | 38 +++++++++++++++++++++++
urlmatch.c | 10 ++++--
urlmatch.h | 5 +++
4 files changed, 113 insertions(+), 9 deletions(-)
base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-620%2Fdscho%2Fcredential-config-partial-url-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-620/dscho/credential-config-partial-url-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/620
--
gitgitgadget
next reply other threads:[~2020-04-24 22:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 22:35 Johannes Schindelin via GitGitGadget [this message]
2020-04-24 22:35 ` [PATCH 1/2] credential: optionally allow partial URLs in credential_from_url_gently() Johannes Schindelin via GitGitGadget
2020-04-24 22:35 ` [PATCH 2/2] credential: handle `credential.<partial-URL>.<key>` again Johannes Schindelin via GitGitGadget
2020-04-24 22:53 ` [PATCH 0/2] credential: handle partial URLs in config settings again (master) Junio C Hamano
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=pull.620.git.1587767749.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--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 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 NNTP newsgroup(s).