git/git-rebase--interactive.sh, branch v2.16.2

Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'

2018-01-10T22:01:24Z

"git rebase -p -X

rebase -p: fix quoting when calling `git merge`

2018-01-05T20:26:01Z

It has been reported that strategy arguments are not passed to `git merge` correctly when rebasing interactively, preserving merges. The reason is that the strategy arguments are already quoted, and then quoted again. This fixes https://github.com/git-for-windows/git/issues/1321 Original-patch-by: Kim Gybels Also-reported-by: Matwey V. Kornilov Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

rebase: do not continue when the todo list generation failed

2017-12-27T20:33:38Z

This is a *really* long-standing bug. As a matter of fact, this bug has been with us from the very beginning of `rebase -i`: 1b1dce4bae7 (Teach rebase an interactive mode, 2007-06-25), where the output of `rev-list` was piped to `sed` (and any failure of the `rev-list` process would go completely undetected). Signed-off-by: Johannes Schindelin 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

Merge branch 'ad/rebase-i-serie-typofix' into maint

2017-11-21T05:05:32Z

Typofix. * ad/rebase-i-serie-typofix: rebase -i: fix comment typo

Merge branch 'ad/rebase-i-serie-typofix'

2017-11-15T03:14:33Z

* ad/rebase-i-serie-typofix: rebase -i: fix comment typo

rebase -i: fix comment typo

2017-11-09T03:32:25Z

Signed-off-by: Adam Dinwoodie Signed-off-by: Junio C Hamano

Merge branch 'js/rebase-i-final'

2017-10-03T06:42:47Z

The final batch to "git rebase -i" updates to move more code from the shell script to C. * js/rebase-i-final: rebase -i: rearrange fixup/squash lines using the rebase--helper t3415: test fixup with wrapped oneline rebase -i: skip unnecessary picks using the rebase--helper rebase -i: check for missing commits in the rebase--helper t3404: relax rebase.missingCommitsCheck tests rebase -i: also expand/collapse the SHA-1s via the rebase--helper rebase -i: do not invent onelines when expanding/collapsing SHA-1s rebase -i: remove useless indentation rebase -i: generate the script via rebase--helper t3415: verify that an empty instructionFormat is handled as before

rebase -i: honor --rerere-autoupdate

2017-08-02T22:16:09Z

Interactive rebase was ignoring '--rerere-autoupdate'. Fix this by reading it appropriate file when restoring the sequencer state for an interactive rebase and passing '--rerere-autoupdate' to merge and cherry-pick when rebasing with '--preserve-merges'. Reported-by: Junio C Hamano Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

rebase -i: rearrange fixup/squash lines using the rebase--helper

2017-07-27T22:35:06Z

This operation has quadratic complexity, which is especially painful on Windows, where shell scripts are *already* slow (mainly due to the overhead of the POSIX emulation layer). Let's reimplement this with linear complexity (using a hash map to match the commits' subject lines) for the common case; Sadly, the fixup/squash feature's design neglected performance considerations, allowing arbitrary prefixes (read: `fixup! hell` will match the commit subject `hello world`), which means that we are stuck with quadratic performance in the worst case. The reimplemented logic also happens to fix a bug where commented-out lines (representing empty patches) were dropped by the previous code. While at it, clarify how the fixup/squash feature works in `git rebase -i`'s man page. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano