path: root/strbuf.h
diff options
authorJunio C Hamano <>2018-11-02 02:04:53 (GMT)
committerJunio C Hamano <>2018-11-02 02:04:53 (GMT)
commitb49ef560ed66449d24a3fdfe25972c390bb44951 (patch)
tree60534d673f60750d6cc4ef2a709ef7a847fc7cdf /strbuf.h
parent5ae50845d8a30d7db32e139ce04b712f9deb99cd (diff)
parent34b47315d9721a576b9536492cca0c11588113a2 (diff)
Merge branch 'ag/rebase-i-in-c'
Rewrite of the remaining "rebase -i" machinery in C. * ag/rebase-i-in-c: rebase -i: move rebase--helper modes to rebase--interactive rebase -i: remove rebase--interactive2: rewrite the submodes of interactive rebase in C rebase -i: implement the main part of interactive rebase as a builtin rebase -i: rewrite init_basic_state() in C rebase -i: rewrite write_basic_state() in C rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C rebase -i: implement the logic to initialize $revisions in C rebase -i: remove unused modes and functions rebase -i: rewrite complete_action() in C t3404: todo list with commented-out commands only aborts sequencer: change the way skip_unnecessary_picks() returns its result sequencer: refactor append_todo_help() to write its message to a buffer rebase -i: rewrite checkout_onto() in C rebase -i: rewrite setup_reflog_action() in C sequencer: add a new function to silence a command, except if it fails rebase -i: rewrite the edit-todo functionality in C editor: add a function to launch the sequence editor rebase -i: rewrite append_todo_help() in C sequencer: make three functions and an enum from sequencer.c public
Diffstat (limited to 'strbuf.h')
1 files changed, 4 insertions, 2 deletions
diff --git a/strbuf.h b/strbuf.h
index bf18fdd..9981f78 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -582,10 +582,12 @@ void strbuf_add_unique_abbrev(struct strbuf *sb,
* run in. If the buffer is NULL the editor is launched as usual but the
* file's contents are not read into the buffer upon completion.
-int launch_editor(const char *path,
- struct strbuf *buffer,
+int launch_editor(const char *path, struct strbuf *buffer,
const char *const *env);
+int launch_sequence_editor(const char *path, struct strbuf *buffer,
+ const char *const *env);
void strbuf_add_lines(struct strbuf *sb,
const char *prefix,
const char *buf,