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

rebase-interactive: rewrite edit_todo_list() to handle the initial edit

Browse Source 
edit_todo_list() is changed to work on a todo_list, and to handle the
initial edition of the todo list (ie. making a backup of the todo
list).

It does not check for dropped commits yet, as todo_list_check() does not
take the commits that have already been processed by the rebase (ie. the
todo list is edited in the middle of a rebase session).

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
2019-03-05 20:18:03 +01:00
committed by Junio C Hamano
parent af1fc3adc5
commit a930eb03a8
5 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rebase-interactive.h
View File

@ -8,7 +8,9 @@ struct todo_list;
void append_todo_help(unsigned keep_empty, int command_count,
const char *shortrevisions, const char *shortonto,
struct strbuf *buf);
int edit_todo_list(struct repository *r, unsigned flags);
int edit_todo_list(struct repository *r, struct todo_list *todo_list,
struct todo_list *new_todo, const char *shortrevisions,
const char *shortonto, unsigned flags);
int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
#endif