Merge git://repo.or.cz/git-gui

diff --git a/http.h b/http.h
index e64084fe6d455652bde1b02012b52879327e2c0a..473179b14d5648635853af4c5bf425116c32b6fe 100644 (file)
--- a/http.h
+++ b/http.h
@@ -143,6 +143,13 @@ struct http_get_options {
        /* If non-NULL, returns the content-type of the response. */
        struct strbuf *content_type;
 
+       /*
+        * If non-NULL, and content_type above is non-NULL, returns
+        * the charset parameter from the content-type. If none is
+        * present, returns an empty string.
+        */
+       struct strbuf *charset;
+
        /*
         * If non-NULL, returns the URL we ended up at, including any
         * redirects we followed.