[PATCH v2 07/12] reset: make reset function non static and declare it in "reset.h"
flat view
DORMANTno replies
From: Christian Couder <hidden>
Date: 2016-06-15 22:48:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- builtin/reset.c | 8 ++++---- reset.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 reset.h
diff --git a/builtin/reset.c b/builtin/reset.c
index b2239d2..f1d7a5a 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c@@ -20,6 +20,7 @@ #include "parse-options.h" #include "unpack-trees.h" #include "cache-tree.h" +#include "reset.h" static const char * const git_reset_usage[] = { "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]",
@@ -27,7 +28,6 @@ static const char * const git_reset_usage[] = { NULL }; -enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE }; static const char *reset_type_names[] = { "mixed", "soft", "hard", "merge", "keep", NULL };
@@ -255,9 +255,9 @@ static int update_heads(unsigned char *sha1) return update_ref(msg, "HEAD", sha1, orig, 0, MSG_ON_ERR); } -static int reset(const char *rev, const char *prefix, - int reset_type, int quiet, int patch_mode, - int argc, const char **argv) +int reset(const char *rev, const char *prefix, + int reset_type, int quiet, int patch_mode, + int argc, const char **argv) { struct commit *commit; unsigned char sha1[20];
diff --git a/reset.h b/reset.h
new file mode 100644
index 0000000..05d2205
--- /dev/null
+++ b/reset.h@@ -0,0 +1,10 @@ +#ifndef RESET_H +#define RESET_H + +enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE }; + +int reset(const char *rev, const char *prefix, + int reset_type, int quiet, int patch_mode, + int argc, const char **argv); + +#endif
--
1.7.0.321.g2d270