diff options
| author |  Alban Gruin <alban.gruin@gmail.com> | 2018-08-28 14:10:37 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-29 13:38:18 -0700 |
| commit | 91f0d95dcb4dd9c388881b64a7d79a3809927126 (patch) | |
| tree | 99231e8e11e68ff2df058afeb07237c2e6ede186 /sequencer.c | |
| parent | rebase -i: rewrite complete_action() in C (diff) | |
| download | tgif-91f0d95dcb4dd9c388881b64a7d79a3809927126.tar.xz | |
rebase -i: remove unused modes and functions
This removes the modes `--skip-unnecessary-picks`, `--append-todo-help`,
and `--checkout-onto` from rebase--helper.c, the functions of
git-rebase--interactive.sh that were rendered useless by the rewrite of
complete_action(), and append_todo_help_to_file() from
rebase-interactive.c.
skip_unnecessary_picks() and checkout_onto() becomes static, as they are
only used inside of the sequencer.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sequencer.c b/sequencer.c index 98aacc8026..de2b5f8208 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3173,9 +3173,9 @@ int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit) return 0; } -int checkout_onto(struct replay_opts *opts, - const char *onto_name, const char *onto, - const char *orig_head) +static int checkout_onto(struct replay_opts *opts, + const char *onto_name, const char *onto, + const char *orig_head) { struct object_id oid; const char *action = reflog_message(opts, "start", "checkout %s", onto_name); @@ -4420,7 +4420,7 @@ static int rewrite_file(const char *path, const char *buf, size_t len) } /* skip picking commits whose parents are unchanged */ -int skip_unnecessary_picks(struct object_id *output_oid) +static int skip_unnecessary_picks(struct object_id *output_oid) { const char *todo_file = rebase_path_todo(); struct strbuf buf = STRBUF_INIT; |