builtin/merge.c: drop a parameter that is never used

diff --git a/http.h b/http.h
index 17116abc570bf3d5577051420d88d839a9603e80..12ca5c892d61a063c856bcdef9154a103c0aa4bc 100644 (file)
--- a/http.h
+++ b/http.h
@@ -133,6 +133,20 @@ struct http_get_options {
 
        /* If non-NULL, returns the content-type of the response. */
        struct strbuf *content_type;
+
+       /*
+        * If non-NULL, returns the URL we ended up at, including any
+        * redirects we followed.
+        */
+       struct strbuf *effective_url;
+
+       /*
+        * If both base_url and effective_url are non-NULL, the base URL will
+        * be munged to reflect any redirections going from the requested url
+        * to effective_url. See the definition of update_url_from_redirect
+        * for details.
+        */
+       struct strbuf *base_url;
 };
 
 /* Return values for http_get_*() */