Merge branch 'pk/stash-apply-status-relative'

diff --git a/url.c b/url.c
index 230623657a0e06975c4721a9fddb117ba84883b1..3e06fd34c46a00b41f4843ea87a151314ce0789c 100644 (file)
--- a/url.c
+++ b/url.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "url.h"
 
 int is_urlschemechar(int first_flag, int ch)
 {
@@ -67,7 +68,8 @@ static int url_decode_char(const char *q)
        return val;
 }
 
-static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out)
+static char *url_decode_internal(const char **query, const char *stop_at,
+                                struct strbuf *out, int decode_plus)
 {
        const char *q = *query;
 
@@ -90,7 +92,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct
                        }
                }
 
-               if (c == '+')
+               if (decode_plus && c == '+')
                        strbuf_addch(out, ' ');
                else
                        strbuf_addch(out, c);
@@ -110,17 +112,31 @@ char *url_decode(const char *url)
                strbuf_add(&out, url, colon - url);
                url = colon;
        }
-       return url_decode_internal(&url, NULL, &out);
+       return url_decode_internal(&url, NULL, &out, 0);
 }
 
 char *url_decode_parameter_name(const char **query)
 {
        struct strbuf out = STRBUF_INIT;
-       return url_decode_internal(query, "&=", &out);
+       return url_decode_internal(query, "&=", &out, 1);
 }
 
 char *url_decode_parameter_value(const char **query)
 {
        struct strbuf out = STRBUF_INIT;
-       return url_decode_internal(query, "&", &out);
+       return url_decode_internal(query, "&", &out, 1);
+}
+
+void end_url_with_slash(struct strbuf *buf, const char *url)
+{
+       strbuf_addstr(buf, url);
+       if (buf->len && buf->buf[buf->len - 1] != '/')
+               strbuf_addstr(buf, "/");
+}
+
+void str_end_url_with_slash(const char *url, char **dest) {
+       struct strbuf buf = STRBUF_INIT;
+       end_url_with_slash(&buf, url);
+       free(*dest);
+       *dest = strbuf_detach(&buf, NULL);
 }