git-remote rename: migrate from remotes/ and branches/

diff --git a/builtin-remote.c b/builtin-remote.c
index 1ca6cdbe2a64a5c4b8d97b30183d48c929b4be53..3af18768e57bd96b4b3caa7db44f149f870d7077 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -359,6 +359,38 @@ static int read_remote_branches(const char *refname,
        return 0;
 }
 
+static int migrate_file(struct remote *remote)
+{
+       struct strbuf buf = STRBUF_INIT;
+       int i;
+       char *path = NULL;
+
+       strbuf_addf(&buf, "remote.%s.url", remote->name);
+       for (i = 0; i < remote->url_nr; i++)
+               if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
+                       return error("Could not append '%s' to '%s'",
+                                       remote->url[i], buf.buf);
+       strbuf_reset(&buf);
+       strbuf_addf(&buf, "remote.%s.push", remote->name);
+       for (i = 0; i < remote->push_refspec_nr; i++)
+               if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
+                       return error("Could not append '%s' to '%s'",
+                                       remote->push_refspec[i], buf.buf);
+       strbuf_reset(&buf);
+       strbuf_addf(&buf, "remote.%s.fetch", remote->name);
+       for (i = 0; i < remote->fetch_refspec_nr; i++)
+               if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
+                       return error("Could not append '%s' to '%s'",
+                                       remote->fetch_refspec[i], buf.buf);
+       if (remote->origin == REMOTE_REMOTES)
+               path = git_path("remotes/%s", remote->name);
+       else if (remote->origin == REMOTE_BRANCHES)
+               path = git_path("branches/%s", remote->name);
+       if (path && unlink(path))
+               warning("failed to remove '%s'", path);
+       return 0;
+}
+
 static int mv(int argc, const char **argv)
 {
        struct option options[] = {
@@ -381,6 +413,9 @@ static int mv(int argc, const char **argv)
        if (!oldremote)
                die("No such remote: %s", rename.old);
 
+       if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
+               return migrate_file(oldremote);
+
        newremote = remote_get(rename.new);
        if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
                die("remote %s already exists.", rename.new);