rev-list: fix process_tree() conversion.

[git.git] / builtin-push.c

diff --git a/builtin-push.c b/builtin-push.c
index 4e659f0..e530022 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -68,14 +68,11 @@ static void set_refspecs(const char **refs, int nr)
        expand_refspecs();
 }
 
-#define MAX_REFSPECS 10
-static int current_refspec = 0;
-static char *refspecs_[MAX_REFSPECS];
-
 static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
 {
        int n = 0;
        FILE *f = fopen(git_path("remotes/%s", repo), "r");
+       int has_explicit_refspec = refspec_nr || all || tags;
 
        if (!f)
                return -1;
@@ -103,10 +100,14 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
                while (isspace(p[-1]))
                        *--p = 0;
 
-               if (!is_refspec && n < MAX_URI)
-                       uri[n++] = strdup(s);
-               else if (is_refspec && current_refspec < MAX_REFSPECS)
-                       refspecs_[current_refspec++] = strdup(s);
+               if (!is_refspec) {
+                       if (n < MAX_URI)
+                               uri[n++] = strdup(s);
+                       else
+                               error("more than %d URL's specified, ignoreing the rest", MAX_URI);
+               }
+               else if (is_refspec && !has_explicit_refspec)
+                       add_refspec(strdup(s));
        }
        fclose(f);
        if (!n)
@@ -114,6 +115,41 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
        return n;
 }
 
+static const char **config_uri;
+static const char *config_repo;
+static int config_repo_len;
+static int config_current_uri;
+static int config_get_refspecs;
+
+static int get_remote_config(const char* key, const char* value)
+{
+       if (!strncmp(key, "remote.", 7) &&
+           !strncmp(key + 7, config_repo, config_repo_len)) {
+               if (!strcmp(key + 7 + config_repo_len, ".url")) {
+                       if (config_current_uri < MAX_URI)
+                               config_uri[config_current_uri++] = strdup(value);
+                       else
+                               error("more than %d URL's specified, ignoring the rest", MAX_URI);
+               }
+               else if (config_get_refspecs &&
+                        !strcmp(key + 7 + config_repo_len, ".push"))
+                       add_refspec(strdup(value));
+       }
+       return 0;
+}
+
+static int get_config_remotes_uri(const char *repo, const char *uri[MAX_URI])
+{
+       config_repo_len = strlen(repo);
+       config_repo = repo;
+       config_current_uri = 0;
+       config_uri = uri;
+       config_get_refspecs = !(refspec_nr || all || tags);
+
+       git_config(get_remote_config);
+       return config_current_uri;
+}
+
 static int get_branches_uri(const char *repo, const char *uri[MAX_URI])
 {
        const char *slash = strchr(repo, '/');
@@ -146,17 +182,25 @@ static int get_branches_uri(const char *repo, const char *uri[MAX_URI])
        return 1;
 }
 
-static int get_uri(const char *repo, const char *uri[MAX_URI])
+/*
+ * Read remotes and branches file, fill the push target URI
+ * list.  If there is no command line refspecs, read Push: lines
+ * to set up the *refspec list as well.
+ * return the number of push target URIs
+ */
+static int read_config(const char *repo, const char *uri[MAX_URI])
 {
        int n;
 
        if (*repo != '/') {
-               current_refspec = 0;
-
                n = get_remotes_uri(repo, uri);
                if (n > 0)
                        return n;
 
+               n = get_config_remotes_uri(repo, uri);
+               if (n > 0)
+                       return n;
+
                n = get_branches_uri(repo, uri);
                if (n > 0)
                        return n;
@@ -169,18 +213,15 @@ static int get_uri(const char *repo, const char *uri[MAX_URI])
 static int do_push(const char *repo)
 {
        const char *uri[MAX_URI];
-       int i, n = get_uri(repo, uri);
+       int i, n;
        int remote;
        const char **argv;
        int argc;
 
-       n = get_uri(repo, uri);
+       n = read_config(repo, uri);
        if (n <= 0)
                die("bad repository '%s'", repo);
 
-       if (refspec_nr == 0)
-               set_refspecs((const char**)refspecs_, current_refspec);
-
        argv = xmalloc((refspec_nr + 10) * sizeof(char *));
        argv[0] = "dummy-send-pack";
        argc = 1;