git/sequencer.c, branch v2.12.2

sequencer (rebase -i): write out the final message

2017-01-17T22:06:01Z

The shell script version of the interactive rebase has a very specific final message. Teach the sequencer to print the same. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): write the progress into files

2017-01-17T22:06:01Z

For the benefit of e.g. the shell prompt, the interactive rebase not only displays the progress for the user to see, but also writes it into the msgnum/end files in the state directory. Teach the sequencer this new trick. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): show the progress

2017-01-17T22:06:01Z

The interactive rebase keeps the user informed about its progress. If the sequencer wants to do the grunt work of the interactive rebase, it also needs to show that progress. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): suggest --edit-todo upon unknown command

2017-01-17T22:06:01Z

This is the same behavior as known from `git rebase -i`. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): show only failed cherry-picks' output

2017-01-17T22:06:01Z

This is the behavior of the shell script version of the interactive rebase, by using the `output` function defined in `git-rebase.sh`. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): show only failed `git commit`'s output

2017-01-17T22:06:01Z

This is the behavior of the shell script version of the interactive rebase, by using the `output` function defined in `git-rebase.sh`. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: use run_command() directly

2017-01-17T22:06:01Z

Instead of using the convenience function run_command_v_opt_cd_env(), we now use the run_command() function. The former function is simply a wrapper of the latter, trying to make it more convenient to use. However, we already have to construct the argv and the env parameters, and we will need even finer control e.g. over the output of the command, so let's just stop using the convenience function. Based on patches and suggestions by Johannes Sixt and Jeff King. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: update reading author-script

2017-01-17T22:05:42Z

Rather than abusing a strbuf to come up with an environment block, let's just use the argv_array structure which serves the same purpose much better. While at it, rename the function to reflect the fact that it does not really care exactly what environment variables are defined in said file. Suggested-by: Jeff King Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer (rebase -i): differentiate between comments and 'noop'

2017-01-09T22:57:30Z

In the upcoming patch, we will support rebase -i's progress reporting. The progress skips comments but counts 'noop's. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

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

2017-01-09T22:57:30Z

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 Signed-off-by: Junio C Hamano