mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
refs/files-backend: add refname
, not "HEAD", to list
An earlier patch rewrote `split_symref_update()` to add a copy of a string to a string list instead of adding the original string. That was so that the original string could be freed in a later patch, but it is also conceptually cleaner, since now all calls to `string_list_insert()` and `string_list_append()` add `update->refname`. --- Except a literal "HEAD" is added in `split_head_update()`. Restructure `split_head_update()` in the same way as the earlier patch did for `split_symref_update()`. This does not correct any practical problem, but makes things conceptually cleaner. The downside is a call to `string_list_has_string()`, which should be relatively cheap. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3f5ef95b5e
commit
276d0e35c0
|
@ -2589,11 +2589,10 @@ static int split_head_update(struct ref_update *update,
|
|||
|
||||
/*
|
||||
* First make sure that HEAD is not already in the
|
||||
* transaction. This insertion is O(N) in the transaction
|
||||
* transaction. This check is O(lg N) in the transaction
|
||||
* size, but it happens at most once per transaction.
|
||||
*/
|
||||
item = string_list_insert(affected_refnames, "HEAD");
|
||||
if (item->util) {
|
||||
if (string_list_has_string(affected_refnames, "HEAD")) {
|
||||
/* An entry already existed */
|
||||
strbuf_addf(err,
|
||||
"multiple updates for 'HEAD' (including one "
|
||||
|
@ -2608,6 +2607,14 @@ static int split_head_update(struct ref_update *update,
|
|||
update->new_oid.hash, update->old_oid.hash,
|
||||
update->msg);
|
||||
|
||||
/*
|
||||
* Add "HEAD". This insertion is O(N) in the transaction
|
||||
* size, but it happens at most once per transaction.
|
||||
* Add new_update->refname instead of a literal "HEAD".
|
||||
*/
|
||||
if (strcmp(new_update->refname, "HEAD"))
|
||||
BUG("%s unexpectedly not 'HEAD'", new_update->refname);
|
||||
item = string_list_insert(affected_refnames, new_update->refname);
|
||||
item->util = new_update;
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue