Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git

diff --git a/branch.c b/branch.c
index e70838fb872f98820a641ccaccc06fd4c0c381f7..579494738a7f804974d2b396a1c795acd4a44789 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -346,9 +346,9 @@ void remove_merge_branch_state(struct repository *r)
        unlink(git_path_merge_mode(r));
 }
 
-void remove_branch_state(struct repository *r)
+void remove_branch_state(struct repository *r, int verbose)
 {
-       sequencer_post_commit_cleanup(r);
+       sequencer_post_commit_cleanup(r, verbose);
        unlink(git_path_squash_msg(r));
        remove_merge_branch_state(r);
 }