| Message ID | 20230912105541.272917-1-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 63642d58b4b28c3caba6d5ab0c3aa98c4ce54eaa |
| Headers | show |
| Series | [v2] sequencer: remove unreachable exit condition in pick_commits() | expand |
On 12/09/2023 11:55, Oswald Buddenhagen wrote: > This was introduced by 56dc3ab04 ("sequencer (rebase -i): implement the > 'edit' command", 2017-01-02), and was pointless from the get-go: all > early exits from the loop above are returns, so todo_list->current == > todo_list->nr is an invariant after the loop. > > Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Thanks for updating the commit message, I think it is clearer now Best Wishes Phillip > --- > v2: > - improved commit message > > Cc: Johannes Schindelin <johannes.schindelin@gmx.de> > Cc: Phillip Wood <phillip.wood123@gmail.com> > Cc: Junio C Hamano <gitster@pobox.com> > --- > sequencer.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/sequencer.c b/sequencer.c > index a66dcf8ab2..99e9c520ca 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -4832,10 +4832,6 @@ static int pick_commits(struct repository *r, > struct strbuf head_ref = STRBUF_INIT, buf = STRBUF_INIT; > struct stat st; > > - /* Stopped in the middle, as planned? */ > - if (todo_list->current < todo_list->nr) > - return 0; > - > if (read_oneliner(&head_ref, rebase_path_head_name(), 0) && > starts_with(head_ref.buf, "refs/")) { > const char *msg;
Phillip Wood <phillip.wood123@gmail.com> writes: > On 12/09/2023 11:55, Oswald Buddenhagen wrote: >> This was introduced by 56dc3ab04 ("sequencer (rebase -i): implement the >> 'edit' command", 2017-01-02), and was pointless from the get-go: all >> early exits from the loop above are returns, so todo_list->current == >> todo_list->nr is an invariant after the loop. >> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> > > Thanks for updating the commit message, I think it is clearer now Thanks, both. Queued.
diff --git a/sequencer.c b/sequencer.c index a66dcf8ab2..99e9c520ca 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4832,10 +4832,6 @@ static int pick_commits(struct repository *r, struct strbuf head_ref = STRBUF_INIT, buf = STRBUF_INIT; struct stat st; - /* Stopped in the middle, as planned? */ - if (todo_list->current < todo_list->nr) - return 0; - if (read_oneliner(&head_ref, rebase_path_head_name(), 0) && starts_with(head_ref.buf, "refs/")) { const char *msg;
This was introduced by 56dc3ab04 ("sequencer (rebase -i): implement the 'edit' command", 2017-01-02), and was pointless from the get-go: all early exits from the loop above are returns, so todo_list->current == todo_list->nr is an invariant after the loop. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> --- v2: - improved commit message Cc: Johannes Schindelin <johannes.schindelin@gmx.de> Cc: Phillip Wood <phillip.wood123@gmail.com> Cc: Junio C Hamano <gitster@pobox.com> --- sequencer.c | 4 ---- 1 file changed, 4 deletions(-)