Commit cd2f74d2 by Edward Thomson

clone: don't assume the default branch name

We derive the branch name, even in our code, we shouldn't assume that
the branch will be "master".
parent 471ed794
...@@ -172,7 +172,7 @@ static int update_head_to_remote( ...@@ -172,7 +172,7 @@ static int update_head_to_remote(
git_refspec *refspec; git_refspec *refspec;
const git_remote_head *remote_head, **refs; const git_remote_head *remote_head, **refs;
const git_oid *remote_head_id; const git_oid *remote_head_id;
git_buf remote_master_name = GIT_BUF_INIT; git_buf remote_branch_name = GIT_BUF_INIT;
git_buf branch = GIT_BUF_INIT; git_buf branch = GIT_BUF_INIT;
if ((error = git_remote_ls(&refs, &refs_len, remote)) < 0) if ((error = git_remote_ls(&refs, &refs_len, remote)) < 0)
...@@ -203,9 +203,9 @@ static int update_head_to_remote( ...@@ -203,9 +203,9 @@ static int update_head_to_remote(
goto cleanup; goto cleanup;
} }
/* Determine the remote tracking reference name from the local master */ /* Determine the remote tracking ref name from the local branch */
if ((error = git_refspec_transform( if ((error = git_refspec_transform(
&remote_master_name, &remote_branch_name,
refspec, refspec,
git_buf_cstr(&branch))) < 0) git_buf_cstr(&branch))) < 0)
goto cleanup; goto cleanup;
...@@ -217,7 +217,7 @@ static int update_head_to_remote( ...@@ -217,7 +217,7 @@ static int update_head_to_remote(
reflog_message); reflog_message);
cleanup: cleanup:
git_buf_dispose(&remote_master_name); git_buf_dispose(&remote_branch_name);
git_buf_dispose(&branch); git_buf_dispose(&branch);
return error; return error;
......
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