diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-05-09 17:10:27 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 11:49:14 +0900 |
commit | b64335554a3691cbc134fb73a598dfd593f44b4e (patch) | |
tree | acb8599602a92beeeeb5f692a0705535d71d44a5 /branch.c | |
parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
download | tgif-b64335554a3691cbc134fb73a598dfd593f44b4e.tar.xz |
merge: remove drop_save() in favor of remove_merge_branch_state()
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>
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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) |