[PATCH v2 1/2] remove_branch_state: convert boolean argument to flags
flat view
HOTtoday
SUPERSEDED
From: Phillip Wood <hidden>
Date: 2026-10-05 13:25:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 4 in this series.
Revisions (4)
- v1 [diff vs current]
- v2 current
- v3 [diff vs current]
- v4 [diff vs current]
From: Phillip Wood <redacted> Convert the "verbose" boolean argument to a flag so that we can add more flags in a future commit. Signed-off-by: Phillip Wood <redacted> --- branch.c | 4 ++-- branch.h | 3 ++- builtin/checkout.c | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/branch.c b/branch.c
index 22f4f46b96..8bc7a395a7 100644
--- a/branch.c
+++ b/branch.c@@ -871,9 +871,9 @@ void remove_merge_branch_state(struct repository *r) save_autostash_ref(r, "MERGE_AUTOSTASH"); } -void remove_branch_state(struct repository *r, int verbose) +void remove_branch_state(struct repository *r, unsigned flags) { - sequencer_post_commit_cleanup(r, verbose); + sequencer_post_commit_cleanup(r, flags & REMOVE_BRANCH_STATE_VERBOSE); unlink(git_path_squash_msg(r)); remove_merge_branch_state(r); }
diff --git a/branch.h b/branch.h
index e9b1f7b37d..42d1b12918 100644
--- a/branch.h
+++ b/branch.h@@ -127,6 +127,7 @@ int validate_branchname(const char *name, struct strbuf *ref); */ int validate_new_branchname(const char *name, struct strbuf *ref, int force); +#define REMOVE_BRANCH_STATE_VERBOSE (1u << 0) /* * Remove information about the merge state on the current * branch. (E.g., MERGE_HEAD)
@@ -137,7 +138,7 @@ void remove_merge_branch_state(struct repository *r); * Remove information about the state of working on the current * branch. (E.g., MERGE_HEAD) */ -void remove_branch_state(struct repository *r, int verbose); +void remove_branch_state(struct repository *r, unsigned flags); /* * Configure local branch "local" as downstream to branch "remote"
diff --git a/builtin/checkout.c b/builtin/checkout.c
index c0f0d2c700..bdd2d816b6 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c@@ -950,6 +950,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts, { struct strbuf msg = STRBUF_INIT; const char *old_desc, *reflog_msg; + unsigned flags = 0; + if (opts->new_branch) { if (opts->new_orphan_branch) { enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;
@@ -1044,7 +1046,9 @@ static void update_refs_for_switch(const struct checkout_opts *opts, old_branch_info->path); } } - remove_branch_state(the_repository, !opts->quiet); + if (!opts->quiet) + flags |= REMOVE_BRANCH_STATE_VERBOSE; + remove_branch_state(the_repository, flags); strbuf_release(&msg); if (!opts->quiet && !opts->force_detach &&
--
2.56.0.134.g299a3c16181