From c369e7b805f927bb87fcf345dd19a55c8b9e6b8e Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Thu, 7 Feb 2008 11:40:16 -0500 Subject: Move code to clean up after a branch change to branch.c Signed-off-by: Daniel Barkalow --- branch.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'branch.c') diff --git a/branch.c b/branch.c index 45ab820c4a..1fc8788897 100644 --- a/branch.c +++ b/branch.c @@ -138,3 +138,11 @@ void create_branch(const char *head, if (real_ref) free(real_ref); } + +void remove_branch_state(void) +{ + unlink(git_path("MERGE_HEAD")); + unlink(git_path("rr-cache/MERGE_RR")); + unlink(git_path("MERGE_MSG")); + unlink(git_path("SQUASH_MSG")); +} -- cgit v1.2.3