[PATCH v4 2/5] sequencer: update `done_nr' when skipping commands in a todo list
- From
Alban Gruin <alban.gruin@gmail.com>
- Date
- Nov 24, 2019, 17:43 UTC
- Message-ID
- <20191124174332.30887-3-alban.gruin@gmail.com>
- In-Reply-To
- <20191124174332.30887-1-alban.gruin@gmail.com>
In a todo list, `done_nr' is the number of commands that were executed or skipped, but skip_unnecessary_picks() did not update it.
This variable is mostly used by command prompts (ie. git-prompt.sh and the like). As in the previous commit, this inconsistent behaviour is not a problem yet, but it would start to matter at the end of this series the same reason.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com> --- sequencer.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sequencer.c b/sequencer.c index 575b852a5a..42313f8de6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -5054,6 +5054,7 @@ static int skip_unnecessary_picks(struct repository *r, MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i); todo_list->nr -= i; todo_list->current = 0; + todo_list->done_nr += i; if (is_fixup(peek_command(todo_list, 0))) record_in_rewritten(base_oid, peek_command(todo_list, 0));
-- 2.24.0