Merge branch 'bw/ref-prefix-for-configured-refspec'

diff --git a/http-push.c b/http-push.c
index a724ef03f9caa292f610a5e93d9ed7331fb53b96..7e38522098bf91c144adaee7f9f5476f8bc72cd2 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1331,7 +1331,7 @@ static int get_delta(struct rev_info *revs, struct remote_lock *lock)
        int count = 0;
 
        while ((commit = get_revision(revs)) != NULL) {
-               p = process_tree(commit->tree, p);
+               p = process_tree(get_commit_tree(commit), p);
                commit->object.flags |= LOCAL;
                if (!(commit->object.flags & UNINTERESTING))
                        count += add_send_request(&commit->object, lock);
@@ -1823,8 +1823,7 @@ int cmd_main(int argc, const char **argv)
        }
 
        /* match them up */
-       if (match_push_refs(local_refs, &remote_refs,
-                           rs.raw_nr, rs.raw, push_all)) {
+       if (match_push_refs(local_refs, &remote_refs, &rs, push_all)) {
                rc = -1;
                goto cleanup;
        }