X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=branch.c;h=579494738a7f804974d2b396a1c795acd4a44789;hb=52bd3e46574baecf06562d4da857ba445981beb9;hp=a594cc23e25458250885244f477a5d4879df2537;hpb=0c47e8ddf5e6584fe8baf8d25b2bcc4ca4c9cb5d;p=thirdparty%2Fgit.git

diff --git a/branch.c b/branch.c
index a594cc23e2..579494738a 100644
--- a/branch.c
+++ b/branch.c
@@ -338,14 +338,19 @@ void create_branch(struct repository *r,
 	free(real_ref);
 }
 
-void remove_branch_state(struct repository *r)
+void remove_merge_branch_state(struct repository *r)
 {
-	sequencer_post_commit_cleanup(r);
 	unlink(git_path_merge_head(r));
 	unlink(git_path_merge_rr(r));
 	unlink(git_path_merge_msg(r));
 	unlink(git_path_merge_mode(r));
+}
+
+void remove_branch_state(struct repository *r, int verbose)
+{
+	sequencer_post_commit_cleanup(r, verbose);
 	unlink(git_path_squash_msg(r));
+	remove_merge_branch_state(r);
 }
 
 void die_if_checked_out(const char *branch, int ignore_current_worktree)