diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-07 19:40:16 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-10 10:16:51 +0300 |
| commit | c369e7b805f927bb87fcf345dd19a55c8b9e6b8e (patch) | |
| tree | ba3333f1efb75d21d3636adfb3d45ccf81b1c0d9 /builtin-reset.c | |
| parent | 94a5728cfb593d80164620f8fa7e1ef322ad0025 (diff) | |
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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin-reset.c b/builtin-reset.c index 3bec06bc8e..af0037ec6e 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); |