From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 0/2] credential: handle partial URLs in config settings again (master)
Date: Fri, 24 Apr 2020 15:53:31 -0700 [thread overview]
Message-ID: <xmqqwo64a42c.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.620.git.1587767749.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Fri, 24 Apr 2020 22:35:47 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> 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.
Thanks for a quick help.
prev parent reply other threads:[~2020-04-24 22:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 22:35 [PATCH 0/2] credential: handle partial URLs in config settings again (master) Johannes Schindelin via GitGitGadget
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 ` Junio C Hamano [this message]
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=xmqqwo64a42c.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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).