diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:47 -0700 |
| commit | c365967f217de9f90ba0c6005e65269388540ddb (patch) | |
| tree | db106dc1bb6480f90a70a2739b131c74e67233ba /builtin | |
| parent | Merge branch 'en/stash-df-fix' into maint (diff) | |
| parent | clone: handle unborn branch in bare repos (diff) | |
| download | tgif-c365967f217de9f90ba0c6005e65269388540ddb.tar.xz | |
Merge branch 'jk/clone-unborn-head-in-bare' into maint
"git clone" from a repository whose HEAD is unborn into a bare
repository didn't follow the branch name the other side used, which
is corrected.
* jk/clone-unborn-head-in-bare:
clone: handle unborn branch in bare repos
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 66fe66679c..7743dc07d2 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1340,6 +1340,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) our_head_points_at = remote_head_points_at; } else { + const char *branch; + char *ref; + if (option_branch) die(_("Remote branch %s not found in upstream %s"), option_branch, remote_name); @@ -1350,24 +1353,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix) remote_head_points_at = NULL; remote_head = NULL; option_no_checkout = 1; - if (!option_bare) { - const char *branch; - char *ref; - - if (transport_ls_refs_options.unborn_head_target && - skip_prefix(transport_ls_refs_options.unborn_head_target, - "refs/heads/", &branch)) { - ref = transport_ls_refs_options.unborn_head_target; - transport_ls_refs_options.unborn_head_target = NULL; - create_symref("HEAD", ref, reflog_msg.buf); - } else { - branch = git_default_branch_name(0); - ref = xstrfmt("refs/heads/%s", branch); - } - install_branch_config(0, branch, remote_name, ref); - free(ref); + if (transport_ls_refs_options.unborn_head_target && + skip_prefix(transport_ls_refs_options.unborn_head_target, + "refs/heads/", &branch)) { + ref = transport_ls_refs_options.unborn_head_target; + transport_ls_refs_options.unborn_head_target = NULL; + create_symref("HEAD", ref, reflog_msg.buf); + } else { + branch = git_default_branch_name(0); + ref = xstrfmt("refs/heads/%s", branch); } + + if (!option_bare) + install_branch_config(0, branch, remote_name, ref); + + free(ref); } write_refspec_config(src_ref_prefix, our_head_points_at, |