Re: [PATCH v3 3/3] credential: handle `credential.<partial-URL>.<key>` again
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 24, 2020, 22:29 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2004250027550.18039@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqq4kt8bk5r.fsf@gitster.c.googlers.com>
Hi Junio,
On Fri, 24 Apr 2020, Junio C Hamano wrote:
Show 25 quoted lines
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > @@ -53,7 +57,13 @@ static int credential_config_callback(const char *var, const char *value,
> > char *url = xmemdupz(key, dot - key);
> > int matched;
> >
> > - credential_from_url(&want, url);
> > + if (credential_from_potentially_partial_url(&want, url) < 0) {
> > + warning(_("skipping credential lookup for key: %s"),
> > + var);
> > + credential_clear(&want);
> > + free(url);
> > + return 0;
> > + }
> > matched = credential_match(&want, c);
>
> Unfortunately, the whole section of this code that is being patched
> here goes away with 46fd7b39 (credential: allow wildcard patterns
> when matching config, 2020-02-20), that delegates large part of the
> logic to urlmatch.
>
> Dscho and Brian, how do we want to proceed? As the conflicting
> change has already been in 'next' for more than a month and a half,
> we'd need this "partial URL" logic build to work well with it.I prepared a PR: https://github.com/gitgitgadget/git/pull/620. I do not necessarily feel 100% comfortable with that approach yet, but at least it lets the new test case of t0300 pass.
Ciao, Dscho