diff options
| author | Alban Gruin <alban.gruin@gmail.com> | 2019-03-05 22:18:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:17:57 +0300 |
| commit | a930eb03a8299b5b29284dd9e3c253c38187167a (patch) | |
| tree | 701fad4abf3ec0445d84a33158c85bf61d0d3ea0 /sequencer.c | |
| parent | af1fc3adc5bf0d831ee3c1c8e86c1b7ce59e070e (diff) | |
rebase-interactive: rewrite edit_todo_list() to handle the initial edit
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 8f3836c479..7d46f76a8b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -55,8 +55,7 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge") * file and written to the tail of 'done'. */ GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo") -static GIT_PATH_FUNC(rebase_path_todo_backup, - "rebase-merge/git-rebase-todo.backup") +GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup") /* * The rebase command lines that have already been processed. A line |