summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--branch.c8
-rw-r--r--branch.h20
-rw-r--r--builtin-reset.c6
3 files changed, 28 insertions, 6 deletions
diff --git a/branch.c b/branch.c
index 45ab820..1fc8788 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"));
+}
diff --git a/branch.h b/branch.h
index 8bcd9dc..d30abe0 100644
--- a/branch.h
+++ b/branch.h
@@ -1,8 +1,24 @@
#ifndef BRANCH_H
#define BRANCH_H
-void create_branch(const char *head,
- const char *name, const char *start_name,
+/* Functions for acting on the information about branches. */
+
+/*
+ * 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);
+/*
+ * Remove information about the state of working on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_branch_state(void);
+
#endif
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);