зеркало из https://github.com/microsoft/git.git
push: anonymize URLs in error messages and warnings
Just like47abd85ba0
(fetch: Strip usernames from url's before storing them, 2009-04-17) and later882d49ca5c
(push: anonymize URL in status output, 2016-07-13), and even laterc1284b21f2
(curl: anonymize URLs in error messages and warnings, 2019-03-04) this change anonymizes URLs (read: strips them of user names and especially passwords) in user-facing error messages and warnings. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
7397ca3373
Коммит
d192fa5006
|
@ -340,6 +340,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
|
|||
{
|
||||
int err;
|
||||
unsigned int reject_reasons;
|
||||
char *anon_url = transport_anonymize_url(transport->url);
|
||||
|
||||
transport_set_verbosity(transport, verbosity, progress);
|
||||
transport->family = family;
|
||||
|
@ -357,18 +358,19 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
|
|||
}
|
||||
|
||||
if (verbosity > 0)
|
||||
fprintf(stderr, _("Pushing to %s\n"), transport->url);
|
||||
fprintf(stderr, _("Pushing to %s\n"), anon_url);
|
||||
trace2_region_enter("push", "transport_push", the_repository);
|
||||
err = transport_push(the_repository, transport,
|
||||
rs, flags, &reject_reasons);
|
||||
trace2_region_leave("push", "transport_push", the_repository);
|
||||
if (err != 0) {
|
||||
fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
|
||||
error(_("failed to push some refs to '%s'"), transport->url);
|
||||
error(_("failed to push some refs to '%s'"), anon_url);
|
||||
fprintf(stderr, "%s", push_get_color(PUSH_COLOR_RESET));
|
||||
}
|
||||
|
||||
err |= transport_disconnect(transport);
|
||||
free(anon_url);
|
||||
if (!err)
|
||||
return 0;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче