From: Eric Wong <e@80x24.org>
To: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Cc: Jann Horn <jannh@google.com>,
Brandon Williams <bmwill@google.com>,
git@vger.kernel.org, sbeller@google.com, bburky@bburky.com,
jrnieder@gmail.com
Subject: [PATCH] http: inform about alternates-as-redirects behavior
Date: Sat, 4 Mar 2017 01:35:04 +0000 [thread overview]
Message-ID: <20170304013504.GA27183@untitled> (raw)
It is disconcerting for users to not notice the behavior
change in handling alternates from commit cb4d2d35c4622ec2
("http: treat http-alternates like redirects")
Give the user a hint about the config option so they can
see the URL and decide whether or not they want to enable
http.followRedirects in their config.
Signed-off-by: Eric Wong <e@80x24.org>
---
http-walker.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/http-walker.c b/http-walker.c
index b34b6ace7..626badfe6 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -168,6 +168,12 @@ static int is_alternate_allowed(const char *url)
};
int i;
+ if (http_follow_config != HTTP_FOLLOW_ALWAYS) {
+ warning("alternate disabled by http.followRedirects!=true: %s",
+ url);
+ return 0;
+ }
+
for (i = 0; i < ARRAY_SIZE(protocols); i++) {
const char *end;
if (skip_prefix(url, protocols[i], &end) &&
@@ -331,9 +337,6 @@ static void fetch_alternates(struct walker *walker, const char *base)
struct alternates_request alt_req;
struct walker_data *cdata = walker->data;
- if (http_follow_config != HTTP_FOLLOW_ALWAYS)
- return;
-
/*
* If another request has already started fetching alternates,
* wait for them to arrive and return to processing this request's
--
EW
next reply other threads:[~2017-03-04 1:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-04 1:35 Eric Wong [this message]
2017-03-04 3:13 ` [PATCH] http: inform about alternates-as-redirects behavior Jeff King
2017-03-04 3:49 ` Jeff King
2017-03-04 6:55 ` Eric Wong
2017-03-04 7:41 ` Jeff King
2017-03-04 8:36 ` [PATCH v2] " Eric Wong
2017-03-04 8:45 ` Jeff King
2017-03-06 18:03 ` Brandon Williams
2017-03-04 15:06 ` [PATCH] " Ramsay Jones
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170304013504.GA27183@untitled \
--to=e@80x24.org \
--cc=bburky@bburky.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jannh@google.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).