diff options
| author | Alban Gruin <alban.gruin@gmail.com> | 2020-01-28 22:12:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-28 23:13:41 +0100 |
| commit | 1da5874c1b283862f8252a2f5f2f8d4afe86346a (patch) | |
| tree | f90ec8e3e57d103a9b94f16dc3eb80c9339625a0 /rebase-interactive.h | |
| parent | rebase -i: also avoid SHA-1 collisions with missingCommitsCheck (diff) | |
| download | git-1da5874c1b283862f8252a2f5f2f8d4afe86346a.tar.xz git-1da5874c1b283862f8252a2f5f2f8d4afe86346a.zip | |
sequencer: move check_todo_list_from_file() to rebase-interactive.c
The message contained in `edit_todo_list_advice' (sequencer.c) is
printed after the initial edit of the todo list if it can't be parsed or
if commits were dropped. This is done either in complete_action() for
`rebase -i', or in check_todo_list_from_file() for `rebase -p'.
Since we want to add this check when editing the list, we also want to
use this message from edit_todo_list() (rebase-interactive.c). To this
end, check_todo_list_from_file() is moved to rebase-interactive.c, and
`edit_todo_list_advice' is copied there. In the next commit,
complete_action() will stop using it, and `edit_todo_list_advice' will
be removed from sequencer.c.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.h')
| -rw-r--r-- | rebase-interactive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rebase-interactive.h b/rebase-interactive.h index 44dbb06311..5f41bf5a28 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -13,4 +13,6 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list, const char *shortonto, unsigned flags); int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); +int check_todo_list_from_file(struct repository *r); + #endif |