git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Christian Couder <chriscool@tuxfamily.org>
Date
Feb 1, 2010, 07:55 UTC
Message-ID
<20100201075542.3929.57485.chriscool@tuxfamily.org>
In-Reply-To
<20100201074835.3929.11509.chriscool@tuxfamily.org>
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
Previous: Christian CouderNext: Christian Couder
Message 7 of 14 in “add --ff option to cherry-pick”
  1. 0/6 add --ff option to cherry-pickChristian Couder, Feb 1, 2010
  2. 1/6 revert: libify cherry-pick and revert functionnalityChristian Couder, Feb 1, 2010
  3. Johannes SchindelinFeb 1, 2010
  4. Stephen BoydFeb 3, 2010
  5. 2/6 reset: refactor updating heads into a static functionChristian Couder, Feb 1, 2010
  6. 3/6 reset: refactor reseting in its own functionChristian Couder, Feb 1, 2010
  7. 4/6 reset: make reset function non static and declare it in "reset.h"Christian Couder, Feb 1, 2010
  8. 5/6 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Feb 1, 2010
  9. Paolo BonziniFeb 1, 2010
  10. Christian CouderFeb 1, 2010
  11. Paolo BonziniFeb 1, 2010
  12. Christian CouderFeb 2, 2010
  13. Paolo BonziniFeb 2, 2010
  14. 6/6 rebase -i: use new --ff cherry-pick optionChristian Couder, Feb 1, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.