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 /reset.c | |
| parent | d8ab1d464d07baa30e5a180eb33b3f9aa5c93adf (diff) | |
| parent | 4865707bdae18163c215f2fa44c37388989bc0e4 (diff) | |
| download | git-4beb7a3b066c98d614d402aec32fc87d76206c89.tar.gz | |
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 'reset.c')
| -rw-r--r-- | reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -72,7 +72,7 @@ static int update_refs(const struct reset_head_opts *opts, switch_to_branch, oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR); if (!ret) - ret = refs_create_symref(get_main_ref_store(the_repository), + ret = refs_update_symref(get_main_ref_store(the_repository), "HEAD", switch_to_branch, reflog_head); } |