diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 16:34:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-09 14:57:30 -0800 |
| commit | b3fdd581ae0e8793b8a1dabbee19334067229888 (patch) | |
| tree | 998f5b0a718c9a290d1952de05716f3e81256e58 /sequencer.c | |
| parent | sequencer (rebase -i): allow rescheduling commands (diff) | |
| download | tgif-b3fdd581ae0e8793b8a1dabbee19334067229888.tar.xz | |
sequencer (rebase -i): implement the 'drop' command
The parsing part of a 'drop' command is almost identical to parsing a
'pick', while the operation is the same as that of a 'noop'.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index dd5b843a84..6e92f186ae 100644 --- a/sequencer.c +++ b/sequencer.c @@ -736,7 +736,8 @@ enum todo_command { /* commands that do something else than handling a single commit */ TODO_EXEC, /* commands that do nothing but are counted for reporting progress */ - TODO_NOOP + TODO_NOOP, + TODO_DROP }; static struct { @@ -750,7 +751,8 @@ static struct { { 'f', "fixup" }, { 's', "squash" }, { 'x', "exec" }, - { 0, "noop" } + { 0, "noop" }, + { 'd', "drop" } }; static const char *command_to_string(const enum todo_command command) @@ -762,7 +764,7 @@ static const char *command_to_string(const enum todo_command command) static int is_noop(const enum todo_command command) { - return TODO_NOOP <= (size_t)command; + return TODO_NOOP <= command; } static int is_fixup(enum todo_command command) |