[RFC/PATCH 4/6] reset: make reset function non static and declare it in "reset.h"

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Christian Couder
Date: Monday, February 1, 2010 - 12:55 am

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 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 bf97931..b004f9a 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] [-q] [<commit>]",
@@ -27,7 +28,6 @@ static const char * const git_reset_usage[] = {
 	NULL
 };
 
-enum reset_type { MIXED, SOFT, HARD, MERGE, NONE };
 static const char *reset_type_names[] = { "mixed", "soft", "hard", "merge", NULL };
 
 static char *args_to_str(const char **argv)
@@ -235,9 +235,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..c8497e4
--- /dev/null
+++ b/reset.h
@@ -0,0 +1,10 @@
+#ifndef RESET_H
+#define RESET_H
+
+enum reset_type { MIXED, SOFT, HARD, MERGE, NONE };
+
+int reset(const char *rev, const char *prefix,
+	  int reset_type, int quiet, int patch_mode,
+	  int argc, const char **argv);
+
+#endif
-- 
1.6.6.1.557.g77031


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC/PATCH 0/6] add --ff option to cherry-pick, Christian Couder, (Mon Feb 1, 12:55 am)
[RFC/PATCH 3/6] reset: refactor reseting in its own function, Christian Couder, (Mon Feb 1, 12:55 am)
[RFC/PATCH 4/6] reset: make reset function non static and ..., Christian Couder, (Mon Feb 1, 12:55 am)
[RFC/PATCH 6/6] rebase -i: use new --ff cherry-pick option, Christian Couder, (Mon Feb 1, 12:55 am)
Re: [RFC/PATCH 1/6] revert: libify cherry-pick and revert ..., Johannes Schindelin, (Mon Feb 1, 3:26 am)
Re: [RFC/PATCH 5/6] revert: add --ff option to allow fast ..., Christian Couder, (Mon Feb 1, 10:13 pm)