From: Alban Gruin <alban.gruin@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>,
Christian Couder <christian.couder@gmail.com>,
Pratik Karki <predatoramigo@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
phillip.wood@dunelm.org.uk, Alban Gruin <alban.gruin@gmail.com>
Subject: [GSoC][PATCH v4 1/2] sequencer: make two functions and an enum from sequencer.c public
Date: Tue, 26 Jun 2018 18:16:42 +0200 [thread overview]
Message-ID: <20180626161643.31152-2-alban.gruin@gmail.com> (raw)
In-Reply-To: <20180626161643.31152-1-alban.gruin@gmail.com>
This makes rebase_path_todo(), get_missign_commit_check_level() and the
enum check_level accessible outside sequencer.c. This will be needed
for the rewrite of append_todo_help() from shell to C, as it will be in
a new library source file, rebase-interactive.c.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
---
sequencer.c | 8 ++------
sequencer.h | 6 ++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 0a291c91f..881a4f7f4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -52,7 +52,7 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge")
* the lines are processed, they are removed from the front of this
* file and written to the tail of 'done'.
*/
-static GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
+GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
/*
* The rebase command lines that have already been processed. A line
* is moved here when it is first handled, before any associated user
@@ -4223,11 +4223,7 @@ int transform_todos(unsigned flags)
return i;
}
-enum check_level {
- CHECK_IGNORE = 0, CHECK_WARN, CHECK_ERROR
-};
-
-static enum check_level get_missing_commit_check_level(void)
+enum check_level get_missing_commit_check_level(void)
{
const char *value;
diff --git a/sequencer.h b/sequencer.h
index c5787c6b5..08397b0d1 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -3,6 +3,7 @@
const char *git_path_commit_editmsg(void);
const char *git_path_seq_dir(void);
+const char *rebase_path_todo(void);
#define APPEND_SIGNOFF_DEDUP (1u << 0)
@@ -57,6 +58,10 @@ struct replay_opts {
};
#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
+enum check_level {
+ CHECK_IGNORE = 0, CHECK_WARN, CHECK_ERROR
+};
+
/* Call this to setup defaults before parsing command line options */
void sequencer_init_config(struct replay_opts *opts);
int sequencer_pick_revisions(struct replay_opts *opts);
@@ -79,6 +84,7 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
int sequencer_add_exec_commands(const char *command);
int transform_todos(unsigned flags);
+enum check_level get_missing_commit_check_level(void);
int check_todo_list(void);
int skip_unnecessary_picks(void);
int rearrange_squash(void);
--
2.18.0
next prev parent reply other threads:[~2018-06-26 16:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-31 11:01 [GSoC][PATCH 0/2] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-05-31 11:01 ` [GSoC][PATCH 1/2] rebase--interactive: " Alban Gruin
2018-05-31 11:01 ` [GSoC][PATCH 2/2] sequencer: remove newlines from append_todo_help() messages Alban Gruin
2018-05-31 17:48 ` [GSoC][PATCH 0/2] rebase -i: rewrite append_todo_help() in C Phillip Wood
2018-05-31 18:44 ` Stefan Beller
2018-05-31 19:33 ` Alban Gruin
2018-05-31 19:41 ` Stefan Beller
2018-06-01 9:44 ` Phillip Wood
2018-06-01 19:46 ` Stefan Beller
2018-05-31 19:25 ` Alban Gruin
2018-06-01 9:38 ` Phillip Wood
2018-06-05 12:53 ` [GSoC][PATCH v2 0/1] " Alban Gruin
2018-06-05 12:53 ` [GSoC][PATCH v2 1/1] rebase--interactive: " Alban Gruin
2018-06-07 10:30 ` [GSoC][PATCH v3 0/1] rebase -i: " Alban Gruin
2018-06-07 10:30 ` [GSoC][PATCH v3 1/1] rebase--interactive: " Alban Gruin
2018-06-26 16:16 ` [GSoC][PATCH v4 0/2] rebase -i: " Alban Gruin
2018-06-26 16:16 ` Alban Gruin [this message]
2018-06-26 21:41 ` [GSoC][PATCH v4 1/2] sequencer: make two functions and an enum from sequencer.c public Johannes Schindelin
2018-06-27 14:54 ` Alban Gruin
2018-06-26 16:16 ` [GSoC][PATCH v4 2/2] rebase--interactive: rewrite append_todo_help() in C Alban Gruin
2018-06-26 21:43 ` Johannes Schindelin
2018-06-26 21:37 ` [GSoC][PATCH v4 0/2] rebase -i: " Johannes Schindelin
2018-06-27 14:54 ` Alban Gruin
2018-06-28 10:04 ` [GSoC][PATCH v5 " Alban Gruin
2018-06-28 10:04 ` [GSoC][PATCH v5 1/2] sequencer: make two functions and an enum from sequencer.c public Alban Gruin
2018-06-28 10:04 ` [GSoC][PATCH v5 2/2] rebase--interactive: rewrite append_todo_help() in C Alban Gruin
2018-06-28 18:05 ` [GSoC][PATCH v5 0/2] rebase -i: " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180626161643.31152-2-alban.gruin@gmail.com \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=predatoramigo@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).