summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2008-02-07 11:40:16 -0500
committerJunio C Hamano <gitster@pobox.com>2008-02-09 23:16:51 -0800
commitc369e7b805f927bb87fcf345dd19a55c8b9e6b8e (patch)
treeba3333f1efb75d21d3636adfb3d45ccf81b1c0d9 /branch.c
parent94a5728cfb593d80164620f8fa7e1ef322ad0025 (diff)
downloadgit-c369e7b805f927bb87fcf345dd19a55c8b9e6b8e.tar.gz
Move code to clean up after a branch change to branch.c
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c8
1 files changed, 8 insertions, 0 deletions
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"));
+}