mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
clone: factor out remote ref writing
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f034d3549f
commit
960b7d1c62
1 changed files with 25 additions and 14 deletions
|
@ -486,6 +486,29 @@ static void write_followtags(const struct ref *refs, const char *msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void update_remote_refs(const struct ref *refs,
|
||||||
|
const struct ref *mapped_refs,
|
||||||
|
const struct ref *remote_head_points_at,
|
||||||
|
const char *branch_top,
|
||||||
|
const char *msg)
|
||||||
|
{
|
||||||
|
if (refs) {
|
||||||
|
clear_extra_refs();
|
||||||
|
write_remote_refs(mapped_refs);
|
||||||
|
if (option_single_branch)
|
||||||
|
write_followtags(refs, msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (remote_head_points_at && !option_bare) {
|
||||||
|
struct strbuf head_ref = STRBUF_INIT;
|
||||||
|
strbuf_addstr(&head_ref, branch_top);
|
||||||
|
strbuf_addstr(&head_ref, "HEAD");
|
||||||
|
create_symref(head_ref.buf,
|
||||||
|
remote_head_points_at->peer_ref->name,
|
||||||
|
msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void update_head(const struct ref *our, const struct ref *remote,
|
static void update_head(const struct ref *our, const struct ref *remote,
|
||||||
const char *msg)
|
const char *msg)
|
||||||
{
|
{
|
||||||
|
@ -782,12 +805,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (refs) {
|
if (refs) {
|
||||||
clear_extra_refs();
|
|
||||||
|
|
||||||
write_remote_refs(mapped_refs);
|
|
||||||
if (option_single_branch)
|
|
||||||
write_followtags(refs, reflog_msg.buf);
|
|
||||||
|
|
||||||
remote_head = find_ref_by_name(refs, "HEAD");
|
remote_head = find_ref_by_name(refs, "HEAD");
|
||||||
remote_head_points_at =
|
remote_head_points_at =
|
||||||
guess_remote_head(remote_head, mapped_refs, 0);
|
guess_remote_head(remote_head, mapped_refs, 0);
|
||||||
|
@ -821,14 +838,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
||||||
"refs/heads/master");
|
"refs/heads/master");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (remote_head_points_at && !option_bare) {
|
update_remote_refs(refs, mapped_refs, remote_head_points_at,
|
||||||
struct strbuf head_ref = STRBUF_INIT;
|
branch_top.buf, reflog_msg.buf);
|
||||||
strbuf_addstr(&head_ref, branch_top.buf);
|
|
||||||
strbuf_addstr(&head_ref, "HEAD");
|
|
||||||
create_symref(head_ref.buf,
|
|
||||||
remote_head_points_at->peer_ref->name,
|
|
||||||
reflog_msg.buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
update_head(our_head_points_at, remote_head, reflog_msg.buf);
|
update_head(our_head_points_at, remote_head, reflog_msg.buf);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue