diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-20 11:20:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-20 11:20:04 -0700 |
| commit | 4beb7a3b066c98d614d402aec32fc87d76206c89 (patch) | |
| tree | 856e6ccd092b8b18c70868be74f70ee85be814e6 /builtin/clone.c | |
| parent | The fifth batch (diff) | |
| parent | refs: remove `create_symref` and associated dead code (diff) | |
| download | git-4beb7a3b066c98d614d402aec32fc87d76206c89.tar.gz git-4beb7a3b066c98d614d402aec32fc87d76206c89.zip | |
Merge branch 'kn/ref-transaction-symref'
Updates to symbolic refs can now be made as a part of ref
transaction.
* kn/ref-transaction-symref:
refs: remove `create_symref` and associated dead code
refs: rename `refs_create_symref()` to `refs_update_symref()`
refs: use transaction in `refs_create_symref()`
refs: add support for transactional symref updates
refs: move `original_update_refname` to 'refs.c'
refs: support symrefs in 'reference-transaction' hook
files-backend: extract out `create_symref_lock()`
refs: accept symref values in `ref_transaction_update()`
Diffstat (limited to 'builtin/clone.c')
| -rw-r--r-- | builtin/clone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 554b29768c..23993b905b 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -653,7 +653,7 @@ static void update_remote_refs(const struct ref *refs, struct strbuf head_ref = STRBUF_INIT; strbuf_addstr(&head_ref, branch_top); strbuf_addstr(&head_ref, "HEAD"); - if (refs_create_symref(get_main_ref_store(the_repository), head_ref.buf, + if (refs_update_symref(get_main_ref_store(the_repository), head_ref.buf, remote_head_points_at->peer_ref->name, msg) < 0) die(_("unable to update %s"), head_ref.buf); @@ -667,7 +667,7 @@ static void update_head(const struct ref *our, const struct ref *remote, const char *head; if (our && skip_prefix(our->name, "refs/heads/", &head)) { /* Local default branch link */ - if (refs_create_symref(get_main_ref_store(the_repository), "HEAD", our->name, NULL) < 0) + if (refs_update_symref(get_main_ref_store(the_repository), "HEAD", our->name, NULL) < 0) die(_("unable to update HEAD")); if (!option_bare) { refs_update_ref(get_main_ref_store(the_repository), @@ -696,7 +696,7 @@ static void update_head(const struct ref *our, const struct ref *remote, * Unborn head from remote; same as "our" case above except * that we have no ref to update. */ - if (refs_create_symref(get_main_ref_store(the_repository), "HEAD", unborn, NULL) < 0) + if (refs_update_symref(get_main_ref_store(the_repository), "HEAD", unborn, NULL) < 0) die(_("unable to update HEAD")); if (!option_bare) install_branch_config(0, head, remote_name, unborn); |