]> git.proxmox.com Git - libgit2.git/commitdiff
Merge pull request #1956 from libgit2/cmn/fetch-default-head
authorVicent Martí <vicent@github.com>
Mon, 11 Nov 2013 14:47:15 +0000 (06:47 -0800)
committerVicent Martí <vicent@github.com>
Mon, 11 Nov 2013 14:47:15 +0000 (06:47 -0800)
Remote revamp (director's cut)

1  2 
src/fetchhead.c
src/transports/smart_protocol.c
tests-clar/online/push.c

diff --cc src/fetchhead.c
Simple merge
Simple merge
index d9ffe8aa9caca104e8be97b60f93a28da40168a5,b5ec77a37d79a4e299e84a7a656692a0238bb5f4..aeb1ab47daf9d54acad1a137c580607520de9e6d
@@@ -155,14 -155,25 +155,13 @@@ static void do_verify_push_status(git_p
   */
  static void verify_refs(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len)
  {
-       git_vector actual_refs = GIT_VECTOR_INIT;
-       git_remote_ls(remote, record_ref_cb, &actual_refs);
-       verify_remote_refs(&actual_refs, expected_refs, expected_refs_len);
+       const git_remote_head **actual_refs;
+       size_t actual_refs_len;
  
-       git_vector_free(&actual_refs);
+       git_remote_ls(&actual_refs, &actual_refs_len, remote);
+       verify_remote_refs(actual_refs, actual_refs_len, expected_refs, expected_refs_len);
  }
  
 -static int tracking_branch_list_cb(const char *branch_name, git_branch_t branch_type, void *payload)
 -{
 -      git_vector *tracking = (git_vector *)payload;
 -
 -      if (branch_type == GIT_BRANCH_REMOTE)
 -              git_vector_insert(tracking, git__strdup(branch_name));
 -      else
 -              GIT_UNUSED(branch_name);
 -
 -      return 0;
 -}
 -
  /**
   * Verifies that after git_push_update_tips(), remote tracking branches have the expected
   * names and oids.