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

[PATCH v3 3/9] reset: make reset function non static and declare it in "reset.h"

From
Christian Couder <chriscool@tuxfamily.org>
Date
Mar 3, 2010, 20:11 UTC
Message-ID
<20100303201146.23506.45925.chriscool@tuxfamily.org>
In-Reply-To
<20100303201046.23506.32653.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 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.315.gbc198
Previous: Christian CouderNext: Christian Couder
Message 4 of 10 in “add --ff option to cherry-pick”
  1. 0/9 add --ff option to cherry-pickChristian Couder, Mar 3, 2010
  2. 1/9 reset: refactor updating heads into a static functionChristian Couder, Mar 3, 2010
  3. 2/9 reset: refactor reseting in its own functionChristian Couder, Mar 3, 2010
  4. 3/9 reset: make reset function non static and declare it in "reset.h"Christian Couder, Mar 3, 2010
  5. 4/9 revert: refactor checking parent in a check_parent() functionChristian Couder, Mar 3, 2010
  6. 5/9 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Mar 3, 2010
  7. 6/9 cherry-pick: add tests for new --ff optionChristian Couder, Mar 3, 2010
  8. 7/9 Documentation: describe new cherry-pick --ff optionChristian Couder, Mar 3, 2010
  9. 8/9 cherry-pick: add a no-op --no-ff option to future proof scriptsChristian Couder, Mar 3, 2010
  10. 9/9 rebase -i: use new --ff cherry-pick optionChristian Couder, Mar 3, 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.