undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
This commit is contained in:
Daniel Barkalow 2008-02-07 11:40:16 -05:00 committed by Junio C Hamano
parent 94a5728cfb
commit c369e7b805
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
branch.c
View File

@ -138,3 +138,11 @@ void create_branch(const char *head,
if (real_ref) if (real_ref)
free(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"));
}

20
branch.h
View File

@ -1,8 +1,24 @@
#ifndef BRANCH_H #ifndef BRANCH_H
#define BRANCH_H #define BRANCH_H
void create_branch(const char *head, /* Functions for acting on the information about branches. */
const char *name, const char *start_name,
/*
* Creates a new branch, where head is the branch currently checked
* out, name is the new branch name, start_name is the name of the
* existing branch that the new branch should start from, force
* enables overwriting an existing (non-head) branch, reflog creates a
* reflog for the branch, and track causes the new branch to be
* configured to merge the remote branch that start_name is a tracking
* branch for (if any).
*/
void create_branch(const char *head, const char *name, const char *start_name,
int force, int reflog, int track); int force, int reflog, int track);
/*
* Remove information about the state of working on the current
* branch. (E.g., MERGE_HEAD)
*/
void remove_branch_state(void);
#endif #endif

6
builtin-reset.c
View File

@ -16,6 +16,7 @@
#include "diff.h" #include "diff.h"
#include "diffcore.h" #include "diffcore.h"
#include "tree.h" #include "tree.h"
#include "branch.h"
static const char builtin_reset_usage[] = static const char builtin_reset_usage[] =
"git-reset [--mixed | --soft | --hard] [-q] [<commit-ish>] [ [--] <paths>...]"; "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; break;
} }
unlink(git_path("MERGE_HEAD")); remove_branch_state();
unlink(git_path("rr-cache/MERGE_RR"));
unlink(git_path("MERGE_MSG"));
unlink(git_path("SQUASH_MSG"));
free(reflog_action); free(reflog_action);