diff options
| author | Alban Gruin <alban.gruin@gmail.com> | 2018-08-10 18:51:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-10 20:56:22 +0200 |
| commit | d4ed5d7713c779487a52d30e83185a056c4bf023 (patch) | |
| tree | 849af7905191b65d6f02495b00c94e652682273e /sequencer.h | |
| parent | sequencer: refactor append_todo_help() to write its message to a buffer (diff) | |
| download | git-d4ed5d7713c779487a52d30e83185a056c4bf023.tar.xz git-d4ed5d7713c779487a52d30e83185a056c4bf023.zip | |
sequencer: change the way skip_unnecessary_picks() returns its result
Instead of skip_unnecessary_picks() printing its result to stdout, it
returns it into a struct object_id, as the rewrite of complete_action()
(to come in the next commit) will need it.
rebase--helper then is modified to fit this change.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index d2b54adf45..fcbcd246c2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -91,7 +91,7 @@ int sequencer_add_exec_commands(const char *command); int transform_todos(unsigned flags); enum missing_commit_check_level get_missing_commit_check_level(void); int check_todo_list(void); -int skip_unnecessary_picks(void); +int skip_unnecessary_picks(struct object_id *output_oid); int rearrange_squash(void); extern const char sign_off_header[]; |