Merge branch 'sb/packfiles-in-repository' into next

diff --git a/builtin/remote.c b/builtin/remote.c
index 210890c8a8ea77d31e70e14f0551f338d6828e50..8708e584e9e8793f3a5e44861d9fb9f049027fa3 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -306,8 +306,6 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                                info->rebase = v;
                        else if (!strcmp(value, "preserve"))
                                info->rebase = NORMAL_REBASE;
-                       else if (!strcmp(value, "recreate"))
-                               info->rebase = NORMAL_REBASE;
                        else if (!strcmp(value, "interactive"))
                                info->rebase = INTERACTIVE_REBASE;
                }
@@ -864,7 +862,7 @@ static int get_remote_ref_states(const char *name,
        if (query) {
                transport = transport_get(states->remote, states->remote->url_nr > 0 ?
                        states->remote->url[0] : NULL);
-               remote_refs = transport_get_remote_refs(transport);
+               remote_refs = transport_get_remote_refs(transport, NULL);
                transport_disconnect(transport);
 
                states->queried = 1;