Teach diff -a as shorthand for --text

diff --git a/builtin-push.c b/builtin-push.c
index 9a861b5afea701ddaa31fba902d535710afda13d..66b94078229c09d8105fcd7f5800a2cba567c972 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ 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;
+       int has_explicit_refspec = refspec_nr || all || tags;
 
        if (!f)
                return -1;
@@ -115,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, '/');
@@ -162,6 +197,10 @@ static int read_config(const char *repo, const char *uri[MAX_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;
@@ -175,7 +214,7 @@ static int do_push(const char *repo)
 {
        const char *uri[MAX_URI];
        int i, n;
-       int remote;
+       int common_argc;
        const char **argv;
        int argc;
 
@@ -192,23 +231,25 @@ static int do_push(const char *repo)
                argv[argc++] = "--force";
        if (execute)
                argv[argc++] = execute;
-       if (thin)
-               argv[argc++] = "--thin";
-       remote = argc;
-       argv[argc++] = "dummy-remote";
-       while (refspec_nr--)
-               argv[argc++] = *refspec++;
-       argv[argc] = NULL;
+       common_argc = argc;
 
        for (i = 0; i < n; i++) {
                int error;
+               int dest_argc = common_argc;
+               int dest_refspec_nr = refspec_nr;
+               const char **dest_refspec = refspec;
                const char *dest = uri[i];
                const char *sender = "git-send-pack";
                if (!strncmp(dest, "http://", 7) ||
                    !strncmp(dest, "https://", 8))
                        sender = "git-http-push";
+               else if (thin)
+                       argv[dest_argc++] = "--thin";
                argv[0] = sender;
-               argv[remote] = dest;
+               argv[dest_argc++] = dest;
+               while (dest_refspec_nr--)
+                       argv[dest_argc++] = *dest_refspec++;
+               argv[dest_argc] = NULL;
                error = run_command_v(argc, argv);
                if (!error)
                        continue;