Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / branch.c

diff --git a/branch.c b/branch.c
index a594cc23e25458250885244f477a5d4879df2537..2d9e7675a6ed24bd70165a78386ad5a6589a3b50 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -338,14 +338,20 @@ 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));
+       save_autostash(git_path_merge_autostash(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)