undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer (rebase -i): implement the 'drop' command

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2017-01-02 16:34:34 +01:00 committed by Junio C Hamano
parent 9d7bf3cf99
commit b3fdd581ae
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sequencer.c
View File

@ -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)