commit c369e7b805f927bb87fcf345dd19a55c8b9e6b8e
author Daniel Barkalow <barkalow@iabervon.org> Thu Feb 07 11:40:16 2008 -0500
committer Junio C Hamano <gitster@pobox.com> Sat Feb 09 23:16:51 2008 -0800
tree ba3333f1efb75d21d3636adfb3d45ccf81b1c0d9
parent 94a5728cfb593d80164620f8fa7e1ef322ad0025

Move code to clean up after a branch change to branch.c

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>

builtin-reset.c

diff --git a/builtin-reset.c b/builtin-reset.c
index 3bec06b..af0037e 100644
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -16,6 +16,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "tree.h"
+#include "branch.h"
 
 static const char builtin_reset_usage[] =
 "git-reset [--mixed | --soft | --hard] [-q] [<commit-ish>] [ [--] <paths>...]";
@@ -270,10 +271,7 @@
 		break;
 	}
 
-	unlink(git_path("MERGE_HEAD"));
-	unlink(git_path("rr-cache/MERGE_RR"));
-	unlink(git_path("MERGE_MSG"));
-	unlink(git_path("SQUASH_MSG"));
+	remove_branch_state();
 
 	free(reflog_action);