From: Johannes Schindelin Date: Thu, 19 Apr 2018 12:18:41 GMT Subject: [PATCH v7 02/17] sequencer: make rearrange_squash() a bit more obvious Message-ID: <1bea3d4cd72e8631780bb460148ad94636427744.1524139900.git.johannes.schindelin@gmx.de> In-Reply-To: There are some commands that have to be skipped from rearranging by virtue of not handling any commits. However, the logic was not quite obvious: it skipped commands based on their position in the enum todo_command. Instead, let's make it explicit that we skip all commands that do not handle any commit. With one exception: the `drop` command, because it, well, drops the commit and is therefore not eligible to rearranging. Note: this is a bit academic at the moment because the only time we call `rearrange_squash()` is directly after generating the todo list, when we have nothing but `pick` commands anyway. However, the upcoming `merge` command *will* want to be handled by that function, and it *can* handle commits. Signed-off-by: Johannes Schindelin --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 096e6d241e0..1ee70d843c1 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3393,7 +3393,7 @@ int rearrange_squash(void) struct subject2item_entry *entry; next[i] = tail[i] = -1; - if (item->command >= TODO_EXEC) { + if (!item->commit || item->command == TODO_DROP) { subjects[i] = NULL; continue; } -- 2.17.0.windows.1.4.g7e4058d72e3