diff options
| author | Alban Gruin <alban.gruin@gmail.com> | 2019-03-05 20:18:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:17:57 +0100 |
| commit | af1fc3adc5bf0d831ee3c1c8e86c1b7ce59e070e (patch) | |
| tree | 18138a3a1ab2301972df0700fa66bd90fb48a94c /rebase-interactive.h | |
| parent | rebase-interactive: use todo_list_write_to_file() in edit_todo_list() (diff) | |
| download | git-af1fc3adc5bf0d831ee3c1c8e86c1b7ce59e070e.tar.xz git-af1fc3adc5bf0d831ee3c1c8e86c1b7ce59e070e.zip | |
rebase-interactive: append_todo_help() changes
This moves the writing of the comment "Rebase $shortrevisions onto
$shortonto ($command_count commands)" from todo_list_write_to_file() to
append_todo_help().
shortrevisions, shortonto, and command_count are passed as parameters to
append_todo_help().
During the initial edit of the todo list, shortrevisions and shortonto
are not NULL. Therefore, if shortrevisions or shortonto is NULL, then
edit_todo would be true, otherwise it would be false. Thus, edit_todo
is removed from the parameters of append_todo_help().
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rebase-interactive.h b/rebase-interactive.h index 187b5032d6..0e5925e3aa 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -5,7 +5,8 @@ struct strbuf; struct repository; struct todo_list; -void append_todo_help(unsigned edit_todo, unsigned keep_empty, +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 todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); |