Commit 8a155a04 by Ben Straub

Fix mismatched git_branch_create args.

parent 7affe23d
...@@ -37,7 +37,7 @@ struct HeadInfo { ...@@ -37,7 +37,7 @@ struct HeadInfo {
static int create_tracking_branch(git_repository *repo, const git_oid *target, const char *name) static int create_tracking_branch(git_repository *repo, const git_oid *target, const char *name)
{ {
git_object *head_obj = NULL; git_object *head_obj = NULL;
git_oid branch_oid; git_reference *branch_ref;
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
/* Find the target commit */ /* Find the target commit */
...@@ -45,7 +45,8 @@ static int create_tracking_branch(git_repository *repo, const git_oid *target, c ...@@ -45,7 +45,8 @@ static int create_tracking_branch(git_repository *repo, const git_oid *target, c
return GIT_ERROR; return GIT_ERROR;
/* Create the new branch */ /* Create the new branch */
if (!git_branch_create(&branch_oid, repo, name, head_obj, 0)) { if (!git_branch_create(&branch_ref, repo, name, head_obj, 0)) {
git_reference_free(branch_ref);
/* Set up tracking */ /* Set up tracking */
git_config *cfg; git_config *cfg;
if (!git_repository_config(&cfg, repo)) { if (!git_repository_config(&cfg, repo)) {
...@@ -94,7 +95,7 @@ static int update_head_to_new_branch(git_repository *repo, const git_oid *target ...@@ -94,7 +95,7 @@ static int update_head_to_new_branch(git_repository *repo, const git_oid *target
git_reference *head; git_reference *head;
if (!git_reference_lookup(&head, repo, GIT_HEAD_FILE)) { if (!git_reference_lookup(&head, repo, GIT_HEAD_FILE)) {
git_buf targetbuf = GIT_BUF_INIT; git_buf targetbuf = GIT_BUF_INIT;
if (!git_buf_printf(&targetbuf, "refs/heads/%s", name) && if (!git_buf_printf(&targetbuf, "refs/heads/%s", name) && /* TODO: "refs/heads" constant? */
!git_reference_set_target(head, git_buf_cstr(&targetbuf))) { !git_reference_set_target(head, git_buf_cstr(&targetbuf))) {
/* Read the tree into the index */ /* Read the tree into the index */
git_commit *commit; git_commit *commit;
......
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