Merge branch 'js/range-diff' into es/format-patch-rangediff

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index ef512616f3016ea0e4564fea8aaa8c16ab002b32..42fd8d1a3528c3ea0b30007407b2ae38f240f4c7 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -121,7 +121,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
                        }
                }
        }
-       return 0;
+       return git_default_config(k, v, cb);
 }
 
 int cmd_send_pack(int argc, const char **argv, const char *prefix)
@@ -265,8 +265,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                BUG("unknown protocol version");
        }
 
-       transport_verify_remote_names(rs.raw_nr, rs.raw);
-
        local_refs = get_local_heads();
 
        flags = MATCH_REFS_NONE;
@@ -277,7 +275,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                flags |= MATCH_REFS_MIRROR;
 
        /* match them up */
-       if (match_push_refs(local_refs, &remote_refs, rs.raw_nr, rs.raw, flags))
+       if (match_push_refs(local_refs, &remote_refs, &rs, flags))
                return -1;
 
        if (!is_empty_cas(&cas))