merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/url.c b/url.c
index bf5bb9c88f751be2dd22bc49bcd9d53812cc5b94..cd8f74f00c345294f94cb25e4e00849a0618168b 100644 (file)
--- a/url.c
+++ b/url.c
@@ -67,7 +67,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 +91,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);
@@ -103,24 +104,24 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct
 char *url_decode(const char *url)
 {
        struct strbuf out = STRBUF_INIT;
-       const char *slash = strchr(url, '/');
+       const char *colon = strchr(url, ':');
 
        /* Skip protocol part if present */
-       if (slash && url < slash) {
-               strbuf_add(&out, url, slash - url);
-               url = slash;
+       if (colon && url < colon) {
+               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);
 }