summaryrefslogtreecommitdiff
path: root/builtin-reset.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2008-02-07 16:40:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-10 07:16:51 (GMT)
commitc369e7b805f927bb87fcf345dd19a55c8b9e6b8e (patch)
treeba3333f1efb75d21d3636adfb3d45ccf81b1c0d9 /builtin-reset.c
parent94a5728cfb593d80164620f8fa7e1ef322ad0025 (diff)
downloadgit-c369e7b805f927bb87fcf345dd19a55c8b9e6b8e.zip
git-c369e7b805f927bb87fcf345dd19a55c8b9e6b8e.tar.gz
git-c369e7b805f927bb87fcf345dd19a55c8b9e6b8e.tar.bz2
Move code to clean up after a branch change to branch.c
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'builtin-reset.c')
-rw-r--r--builtin-reset.c6
1 files changed, 2 insertions, 4 deletions
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 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
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);