mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: move check_todo_list_from_file() to rebase-interactive.c

Browse Source 
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>
This commit is contained in:
Alban Gruin
2020-01-28 22:12:45 +01:00
committed by Junio C Hamano
parent 26027625dd
commit 1da5874c1b
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rebase-interactive.h
View File

@ -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