git/sequencer.c, branch v2.16.2

sequencer: do not invent whitespace when transforming OIDs

2017-12-27T20:33:38Z

For commands that do not have an argument, there is no need to append a trailing space at the end of the line. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: report when noop has an argument

2017-12-27T20:33:38Z

The noop command cannot accept any argument, but we never told the user about any bogus argument. Fix that. while at it, mention clearly when an argument is required but missing (for commands *other* than noop). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: remove superfluous conditional

2017-12-27T20:33:38Z

In a conditional block that is only reached when handling a TODO_REWORD (as seen even from a 3-line context), there is absolutely no need to nest another block under the identical condition. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: strip bogus LF at end of error messages

2017-12-27T20:33:38Z

Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'lb/rebase-i-short-command-names'

2017-12-27T19:16:21Z

With a configuration variable rebase.abbreviateCommands set, "git rebase -i" produces the todo list with a single-letter command names. * lb/rebase-i-short-command-names: sequencer.c: drop 'const' from function return type t3404: add test case for abbreviated commands rebase -i: learn to abbreviate command names rebase -i -x: add exec commands via the rebase--helper rebase -i: update functions to use a flags parameter rebase -i: replace reference to sha1 with oid rebase -i: refactor transform_todo_ids rebase -i: set commit to null in exec commands Documentation: use preferred name for the 'todo list' script Documentation: move rebase.* configs to new file

sequencer.c: drop 'const' from function return type

2017-12-27T19:12:45Z

With -Werror=ignored-qualifiers, a function that claims to return "const char" gets this error: CC sequencer.o sequencer.c:798:19: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] static const char command_to_char(const enum todo_command command) ^ Reported-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'en/rename-progress'

2017-12-19T19:33:55Z

Historically, the diff machinery for rename detection had a hardcoded limit of 32k paths; this is being lifted to allow users trade cycles with a (possibly) easier to read result. * en/rename-progress: diffcore-rename: make diff-tree -l0 mean -l sequencer: show rename progress during cherry picks diff: remove silent clamp of renameLimit progress: fix progress meters when dealing with lots of work sequencer: warn when internal merge may be suboptimal due to renameLimit

Merge branch 'bc/hash-algo'

2017-12-13T21:28:54Z

An infrastructure to define what hash function is used in Git is introduced, and an effort to plumb that throughout various codepaths has been started. * bc/hash-algo: repository: fix a sparse 'using integer as NULL pointer' warning Switch empty tree and blob lookups to use hash abstraction Integrate hash algorithm support with repo setup Add structure representing hash algorithm setup: expose enumerated repo info

rebase -i: learn to abbreviate command names

2017-12-05T18:20:51Z

`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin Signed-off-by: Liam Beguin Signed-off-by: Junio C Hamano

rebase -i -x: add exec commands via the rebase--helper

2017-12-05T18:20:51Z

Recent work on `git-rebase--interactive` aims to convert shell code to C. Even if this is most likely not a big performance enhancement, let's convert it too since a coming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin Signed-off-by: Junio C Hamano