kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remove_branch_state: convert boolean argument to flags 

Convert the "verbose" boolean argument to a flag so that we can add
more flags in a future commit.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
jch
Phillip Wood 2026-10-09 10:13:24 +01:00 committed by Junio C Hamano
parent a018953688
commit 144d8e373f
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
branch.c
View File

@ -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);
}

3
branch.h
View File

@ -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"

6
builtin/checkout.c
View File

@ -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 &&