@matheusbsbs / matheus-bagliano / commits / 118fd1a26d

branch: stop modifying `log_all_ref_updates` variable

In "branch.c" we modify the global `log_all_ref_updates` variable to force creation of a reflog entry. Modifying global state like this is discouraged, as it may have all kinds of consequences in other places of our codebase. Stop modifying the variable and pass the `REF_FORCE_CREATE_REFLOG` flag instead. Setting this flag has a stronger meaning than setting the config to `LOG_REFS_NORMAL`: - `LOG_REFS_NORMAL` will ask us to only create reflog entries for preexisting reflogs or branches, remote refs, note refs and HEAD. - `REF_FORCE_CREATE_REFLOG` will unconditionally create a reflog and is thus equivalent to `LOG_REFS_ALWAYS`. But as we are in `create_branch()` and thus do not have to worry about arbitrary references, but only about branches, `LOG_REFS_NORMAL` and `LOG_REFS_ALWAYS` are indeed equivalent. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Sep 12, 2024 at 13:30 UTC 118fd1a26da681d33dfc65e9dbf74e2dda0c5b3e

1 file changed +3 -2

branch.c

+3 -2

@@ -601,6 +601,7 @@ void create_branch(struct repository *r,

601 int forcing = 0;

602 struct ref_transaction *transaction;

603 struct strbuf err = STRBUF_INIT;

604 + int flags = 0;

605 char *msg;

606

607 if (track == BRANCH_TRACK_OVERRIDE)

@@ -619,7 +620,7 @@ void create_branch(struct repository *r,

620 goto cleanup;

621

622 if (reflog)

622 - log_all_ref_updates = LOG_REFS_NORMAL;

623 + flags |= REF_FORCE_CREATE_REFLOG;

624

625 if (forcing)

626 msg = xstrfmt("branch: Reset to %s", start_name);

@@ -630,7 +631,7 @@ void create_branch(struct repository *r,

631 if (!transaction ||

632 ref_transaction_update(transaction, ref.buf,

633 &oid, forcing ? NULL : null_oid(),

633 - NULL, NULL, 0, msg, &err) ||

634 + NULL, NULL, flags, msg, &err) ||

635 ref_transaction_commit(transaction, &err))

636 die("%s", err.buf);

637 ref_transaction_free(transaction);