mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: remove drop_save() in favor of remove_merge_branch_state()

Browse Source 
Both remove_branch_state() and drop_save() delete almost the same set of
files about the current merge state. The only difference is MERGE_RR but
it should also be cleaned up after a successful merge, which is what
drop_save() is for.

Make a new function that deletes all merge-related state files and use
it instead of drop_save(). This function will also be used in the next
patch that introduces --quit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-05-09 17:10:27 +07:00
committed by Junio C Hamano
parent aeb582a983
commit b64335554a
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
branch.c
View File

@ -337,15 +337,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)
{
unlink(git_path_cherry_pick_head(r));
unlink(git_path_revert_head(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)
{
unlink(git_path_cherry_pick_head(r));
unlink(git_path_revert_head(r));
unlink(git_path_squash_msg(r));
remove_merge_branch_state(r);
}
void die_if_checked_out(const char *branch, int ignore_current_worktree)