diff options
| author | Vicent Martà <vicent@github.com> | 2013-04-22 07:44:32 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-04-22 07:44:32 -0700 |
| commit | a472f887fe8510bd972f8ce8bec6c9f53601aefb (patch) | |
| tree | e9bc91e80f29479077b595aa138454e4a165063c /src/clone.c | |
| parent | f063a75882769cb6fc652de425ac16ba4b88b616 (diff) | |
| parent | 1be680c4d0909ee5160292d7b56c4522c4bc309c (diff) | |
| download | libgit2-a472f887fe8510bd972f8ce8bec6c9f53601aefb.tar.gz | |
Merge pull request #1493 from carlosmn/remotes
Revamp the refspec handling
Diffstat (limited to 'src/clone.c')
| -rw-r--r-- | src/clone.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/clone.c b/src/clone.c index 0bbccd44b..8f10ca819 100644 --- a/src/clone.c +++ b/src/clone.c @@ -187,6 +187,7 @@ static int get_head_callback(git_remote_head *head, void *payload) static int update_head_to_remote(git_repository *repo, git_remote *remote) { int retcode = -1; + git_refspec dummy_spec; git_remote_head *remote_head; struct head_info head_info; git_buf remote_master_name = GIT_BUF_INIT; @@ -211,8 +212,13 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote) git_oid_cpy(&head_info.remote_head_oid, &remote_head->oid); git_buf_init(&head_info.branchname, 16); head_info.repo = repo; - head_info.refspec = git_remote_fetchspec(remote); + head_info.refspec = git_remote__matching_refspec(remote, GIT_REFS_HEADS_MASTER_FILE); head_info.found = 0; + + if (head_info.refspec == NULL) { + memset(&dummy_spec, 0, sizeof(git_refspec)); + head_info.refspec = &dummy_spec; + } /* Determine the remote tracking reference name from the local master */ if (git_refspec_transform_r( @@ -318,11 +324,11 @@ static int create_and_configure_origin( goto on_error; if (options->fetch_spec && - (error = git_remote_set_fetchspec(origin, options->fetch_spec)) < 0) + (error = git_remote_add_fetch(origin, options->fetch_spec)) < 0) goto on_error; if (options->push_spec && - (error = git_remote_set_pushspec(origin, options->push_spec)) < 0) + (error = git_remote_add_push(origin, options->push_spec)) < 0) goto on_error; if (options->pushurl && |