diff options
| -rw-r--r-- | builtin/rebase--helper.c | 13 | ||||
| -rw-r--r-- | sequencer.c | 9 | ||||
| -rw-r--r-- | sequencer.h | 8 |
3 files changed, 17 insertions, 13 deletions
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index c3b8e4d401..1102ecb43b 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -12,7 +12,7 @@ static const char * const builtin_rebase_helper_usage[] = { int cmd_rebase__helper(int argc, const char **argv, const char *prefix) { struct replay_opts opts = REPLAY_OPTS_INIT; - int keep_empty = 0; + unsigned flags = 0, keep_empty = 0; enum { CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS, CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH @@ -48,16 +48,17 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, NULL, options, builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0); + flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0; + flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0; + if (command == CONTINUE && argc == 1) return !!sequencer_continue(&opts); if (command == ABORT && argc == 1) return !!sequencer_remove_state(&opts); if (command == MAKE_SCRIPT && argc > 1) - return !!sequencer_make_script(keep_empty, stdout, argc, argv); - if (command == SHORTEN_OIDS && argc == 1) - return !!transform_todos(1); - if (command == EXPAND_OIDS && argc == 1) - return !!transform_todos(0); + return !!sequencer_make_script(stdout, argc, argv, flags); + if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1) + return !!transform_todos(flags); if (command == CHECK_TODO_LIST && argc == 1) return !!check_todo_list(); if (command == SKIP_UNNECESSARY_PICKS && argc == 1) diff --git a/sequencer.c b/sequencer.c index c9a661a8c4..8b0dd610c8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2444,14 +2444,15 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag) strbuf_release(&sob); } -int sequencer_make_script(int keep_empty, FILE *out, - int argc, const char **argv) +int sequencer_make_script(FILE *out, int argc, const char **argv, + unsigned flags) { char *format = NULL; struct pretty_print_context pp = {0}; struct strbuf buf = STRBUF_INIT; struct rev_info revs; struct commit *commit; + int keep_empty = flags & TODO_LIST_KEEP_EMPTY; init_revisions(&revs, NULL); revs.verbose_header = 1; @@ -2494,7 +2495,7 @@ int sequencer_make_script(int keep_empty, FILE *out, } -int transform_todos(int shorten_ids) +int transform_todos(unsigned flags) { const char *todo_file = rebase_path_todo(); struct todo_list todo_list = TODO_LIST_INIT; @@ -2522,7 +2523,7 @@ int transform_todos(int shorten_ids) /* add commit id */ if (item->commit) { - const char *oid = shorten_ids ? + const char *oid = flags & TODO_LIST_SHORTEN_IDS ? short_commit_name(item->commit) : oid_to_hex(&item->commit->object.oid); diff --git a/sequencer.h b/sequencer.h index 4f7f2c93f8..68284e9762 100644 --- a/sequencer.h +++ b/sequencer.h @@ -45,10 +45,12 @@ int sequencer_continue(struct replay_opts *opts); int sequencer_rollback(struct replay_opts *opts); int sequencer_remove_state(struct replay_opts *opts); -int sequencer_make_script(int keep_empty, FILE *out, - int argc, const char **argv); +#define TODO_LIST_KEEP_EMPTY (1U << 0) +#define TODO_LIST_SHORTEN_IDS (1U << 1) +int sequencer_make_script(FILE *out, int argc, const char **argv, + unsigned flags); -int transform_todos(int shorten_ids); +int transform_todos(unsigned flags); int check_todo_list(void); int skip_unnecessary_picks(void); int rearrange_squash(void); |