Merge branch 'pt/pull-tests' into pt/pull-optparse

diff --git a/builtin/remote.c b/builtin/remote.c
index 5d3ab906bc7ef6cc8cc9c65a3b86cf4c1ff443fb..ad57fc984edc8a7ea7f3784e14068e247a5d27ad 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -584,7 +584,7 @@ static int migrate_file(struct remote *remote)
 {
        struct strbuf buf = STRBUF_INIT;
        int i;
-       char *path = NULL;
+       const char *path = NULL;
 
        strbuf_addf(&buf, "remote.%s.url", remote->name);
        for (i = 0; i < remote->url_nr; i++)