git/sequencer.c, branch v2.20.2

Merge branch 'js/rebase-r-and-merge-head'

2018-11-18T09:23:56Z

Bugfix for the recently graduated "git rebase --rebase-merges". * js/rebase-r-and-merge-head: status: rebase and merge can be in progress at the same time built-in rebase --skip/--abort: clean up stale .git/ files rebase -i: include MERGE_HEAD into files to clean up rebase -r: do not write MERGE_HEAD unless needed rebase -r: demonstrate bug with conflicting merges

Merge branch 'bp/refresh-index-using-preload'

2018-11-13T13:37:26Z

The helper function to refresh the cached stat information in the in-core index has learned to perform the lstat() part of the operation in parallel on multi-core platforms. * bp/refresh-index-using-preload: refresh_index: remove unnecessary calls to preload_index() speed up refresh_index() by utilizing preload_index()

Merge branch 'ag/rebase-i-in-c'

2018-11-13T13:37:25Z

Code clean-up for a topic already in 'master'. * ag/rebase-i-in-c: sequencer.c: remove a stray semicolon

Merge branch 'pw/am-rebase-read-author-script'

2018-11-13T13:37:23Z

Unify code to read the author-script used in "git am" and the commands that use the sequencer machinery, e.g. "git rebase -i". * pw/am-rebase-read-author-script: sequencer: use read_author_script() add read_author_script() to libgit am: rename read_author_script() am: improve author-script error reporting am: don't die in read_author_script()

Merge branch 'ma/sequencer-do-reset-saner-loop-termination'

2018-11-13T13:37:21Z

Code readability fix. * ma/sequencer-do-reset-saner-loop-termination: sequencer: break out of loop explicitly

rebase -i: include MERGE_HEAD into files to clean up

2018-11-13T03:04:00Z

Every once in a while, the interactive rebase makes sure that no stale files are lying around. These days, we need to include MERGE_HEAD into that set of files, as the `merge` command will generate them. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

rebase -r: do not write MERGE_HEAD unless needed

2018-11-13T03:04:00Z

When we detect that a `merge` can be skipped because the merged commit is already an ancestor of HEAD, we do not need to commit, therefore writing the MERGE_HEAD file is useless. It is actually worse than useless: a subsequent `git commit` will pick it up and think that we want to merge that commit, still. To avoid that, move the code that writes the MERGE_HEAD file to a location where we already know that the `merge` cannot be skipped. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

refresh_index: remove unnecessary calls to preload_index()

2018-11-06T03:49:59Z

With refresh_index() learning to utilize preload_index() to speed up its operation there is no longer any benefit to having the caller preload the index first. Remove those unneeded calls by calling read_index() instead of the preload variant. There is no measurable performance impact of this patch - the 2nd call to preload_index() bails out quickly but there is no reason to call it twice. Signed-off-by: Ben Peart Signed-off-by: Junio C Hamano

sequencer.c: remove a stray semicolon

2018-11-05T01:24:55Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'js/rebase-i-shortopt'

2018-11-02T02:04:59Z

"git rebase -i" learned to take 'b' as the short form of 'break' option in the todo list. * js/rebase-i-shortopt: rebase -i: recognize short commands without arguments