Commit 4fbc899a by Ben Straub

Clone: local branch for remote HEAD.

Now creating a local branch that tracks to the
origin's HEAD branch, and setting HEAD to that.
parent 8340dd5d
...@@ -10,37 +10,121 @@ ...@@ -10,37 +10,121 @@
#include "git2/clone.h" #include "git2/clone.h"
#include "git2/remote.h" #include "git2/remote.h"
#include "git2/revparse.h" #include "git2/revparse.h"
#include "git2/branch.h"
#include "git2/config.h"
#include "common.h" #include "common.h"
#include "remote.h" #include "remote.h"
#include "fileops.h" #include "fileops.h"
#include "refs.h"
// TODO #include "checkout.h" // TODO #include "checkout.h"
GIT_BEGIN_DECL GIT_BEGIN_DECL
struct HeadInfo {
git_repository *repo;
git_oid remote_head_oid;
git_buf branchname;
};
static int git_checkout_force(git_repository *repo) static int git_checkout_force(git_repository *repo)
{ {
/* TODO */ /* TODO
* -> Line endings
*/
return 0;
}
static int create_tracking_branch(struct HeadInfo *info)
{
git_object *head_obj = NULL;
git_oid branch_oid;
int retcode = GIT_ERROR;
const char *branchname = git_buf_cstr(&info->branchname);
/* Find the target commit */
if (git_object_lookup(&head_obj, info->repo, &info->remote_head_oid, GIT_OBJ_ANY) < 0)
return GIT_ERROR;
/* Create the new branch */
if (!git_branch_create(&branch_oid, info->repo, branchname, head_obj, 0)) {
/* Set up tracking */
git_config *cfg;
if (!git_repository_config(&cfg, info->repo)) {
git_buf remote = GIT_BUF_INIT;
git_buf merge = GIT_BUF_INIT;
git_buf merge_target = GIT_BUF_INIT;
if (!git_buf_printf(&remote, "branch.%s.remote", branchname) &&
!git_buf_printf(&merge, "branch.%s.merge", branchname) &&
!git_buf_printf(&merge_target, "refs/heads/%s", branchname) &&
!git_config_set_string(cfg, git_buf_cstr(&remote), "origin") &&
!git_config_set_string(cfg, git_buf_cstr(&merge), git_buf_cstr(&merge_target))) {
retcode = 0;
}
git_buf_free(&remote);
git_buf_free(&merge);
git_buf_free(&merge_target);
git_config_free(cfg);
}
}
return retcode;
}
static int reference_matches_remote_head(const char *head_name, void *payload)
{
struct HeadInfo *head_info = (struct HeadInfo *)payload;
git_oid oid;
/* Stop looking if we've already found a match */
if (git_buf_len(&head_info->branchname) > 0) return 0;
if (!git_reference_name_to_oid(&oid, head_info->repo, head_name) &&
!git_oid_cmp(&head_info->remote_head_oid, &oid)) {
/* strlen("refs/remotes/origin/") == 20 */
git_buf_puts(&head_info->branchname, head_name+20);
}
return 0; return 0;
} }
static int update_head_to_remote(git_repository *repo, git_remote *remote) static int update_head_to_remote(git_repository *repo, git_remote *remote)
{ {
int retcode = 0; int retcode = 0;
git_remote_head *remote_head;
struct HeadInfo head_info;
/* Get the remote's HEAD. This is always the first ref in remote->refs. */ /* Get the remote's HEAD. This is always the first ref in remote->refs. */
git_buf remote_default_branch = GIT_BUF_INIT; remote_head = remote->refs.contents[0];
/* TODO */ git_oid_cpy(&head_info.remote_head_oid, &remote_head->oid);
git_buf_init(&head_info.branchname, 16);
git_buf_free(&remote_default_branch); head_info.repo = repo;
/* Find the branch the remote head belongs to. */
if (!git_reference_foreach(repo, GIT_REF_LISTALL, reference_matches_remote_head, &head_info) &&
git_buf_len(&head_info.branchname) > 0) {
if (!create_tracking_branch(&head_info)) {
/* Update HEAD to point to the new branch */
git_reference *head;
if (!git_reference_lookup(&head, repo, "HEAD")) {
git_buf target = GIT_BUF_INIT;
if (!git_buf_printf(&target, "refs/heads/%s", git_buf_cstr(&head_info.branchname)) &&
!git_reference_set_target(head, git_buf_cstr(&target))) {
retcode = 0;
}
git_buf_free(&target);
git_reference_free(head);
}
}
}
git_buf_free(&head_info.branchname);
return retcode; return retcode;
} }
/* /*
* submodules? * submodules?
* filemodes? * filemodes?
* Line endings
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment