diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-05-09 13:10:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 05:49:14 +0300 |
commit | b64335554a3691cbc134fb73a598dfd593f44b4e (patch) | |
tree | acb8599602a92beeeeb5f692a0705535d71d44a5 /branch.h | |
parent | aeb582a98374c094361cba1bd756dc6307432c42 (diff) |
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.h')
-rw-r--r-- | branch.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -61,6 +61,12 @@ extern int validate_branchname(const char *name, struct strbuf *ref); extern int validate_new_branchname(const char *name, struct strbuf *ref, int force); /* + * Remove information about the merge state on the current + * branch. (E.g., MERGE_HEAD) + */ +void remove_merge_branch_state(struct repository *r); + +/* * Remove information about the state of working on the current * branch. (E.g., MERGE_HEAD) */ |