"git-push $URL" without refspecs pushes only matching branches

diff --git a/remote.c b/remote.c
index f469fb34e41cc9e1d80c0a71ed928a47bbadd267..cf98a44367cfad364871af4f1e191a9e7412562d 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -333,7 +333,6 @@ static int count_refspec_match(const char *pattern,
        for (weak_match = match = 0; refs; refs = refs->next) {
                char *name = refs->name;
                int namelen = strlen(name);
-               int weak_match;
 
                if (namelen < patlen ||
                    memcmp(name + namelen - patlen, pattern, patlen))
@@ -430,9 +429,6 @@ static int match_explicit(struct ref *src, struct ref *dst,
        if (rs->pattern)
                return errs;
 
-       if (dst_value == NULL)
-               dst_value = rs->src;
-
        matched_src = matched_dst = NULL;
        switch (count_refspec_match(rs->src, src, &matched_src)) {
        case 1:
@@ -445,42 +441,41 @@ static int match_explicit(struct ref *src, struct ref *dst,
                matched_src = try_explicit_object_name(rs->src);
                if (matched_src)
                        break;
-               errs = 1;
                error("src refspec %s does not match any.",
                      rs->src);
                break;
        default:
-               errs = 1;
+               matched_src = NULL;
                error("src refspec %s matches more than one.",
                      rs->src);
                break;
        }
+
+       if (!matched_src)
+               errs = 1;
+
+       if (dst_value == NULL)
+               dst_value = matched_src->name;
+
        switch (count_refspec_match(dst_value, dst, &matched_dst)) {
        case 1:
                break;
        case 0:
                if (!memcmp(dst_value, "refs/", 5))
                        matched_dst = make_dst(dst_value, dst_tail);
-               else if (!strcmp(rs->src, dst_value) && matched_src)
-                       /* pushing "master:master" when
-                        * remote does not have master yet.
-                        */
-                       matched_dst = make_dst(matched_src->name, dst_tail);
-               else {
-                       errs = 1;
+               else
                        error("dst refspec %s does not match any "
                              "existing ref on the remote and does "
                              "not start with refs/.", dst_value);
-               }
                break;
        default:
-               errs = 1;
+               matched_dst = NULL;
                error("dst refspec %s matches more than one.",
                      dst_value);
                break;
        }
-       if (errs)
-               return errs;
+       if (errs || matched_dst == NULL)
+               return 1;
        if (matched_dst->peer_ref) {
                errs = 1;
                error("dst ref %s receives from more than one src.",
@@ -549,15 +544,23 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
                        if (!pat)
                                continue;
                }
+               else if (prefixcmp(src->name, "refs/heads/"))
+                       /*
+                        * "matching refs"; traditionally we pushed everything
+                        * including refs outside refs/heads/ hierarchy, but
+                        * that does not make much sense these days.
+                        */
+                       continue;
 
                if (pat) {
-                       dst_name = xmalloc(strlen(pat->dst) +
+                       const char *dst_side = pat->dst ? pat->dst : pat->src;
+                       dst_name = xmalloc(strlen(dst_side) +
                                           strlen(src->name) -
                                           strlen(pat->src) + 2);
-                       strcpy(dst_name, pat->dst);
+                       strcpy(dst_name, dst_side);
                        strcat(dst_name, src->name + strlen(pat->src));
                } else
-                       dst_name = strdup(src->name);
+                       dst_name = xstrdup(src->name);
                dst_peer = find_ref_by_name(dst, dst_name);
                if (dst_peer && dst_peer->peer_ref)
                        /* We're already sending something to this ref. */