git, branch v2.16.0-rc1

Git 2.16-rc1

2018-01-05T21:45:17Z

Signed-off-by: Junio C Hamano

Merge branch 'js/sequencer-cleanups'

2018-01-05T21:28:12Z

Code cleanup. * js/sequencer-cleanups: sequencer: do not invent whitespace when transforming OIDs sequencer: report when noop has an argument sequencer: remove superfluous conditional sequencer: strip bogus LF at end of error messages rebase: do not continue when the todo list generation failed

Merge branch 'jh/memihash-opt'

2018-01-05T21:28:11Z

Squelch compiler warning. * jh/memihash-opt: t/helper/test-lazy-name-hash: fix compilation

Merge branch 'tb/test-lint-wc-l'

2018-01-05T21:28:11Z

Test update. * tb/test-lint-wc-l: check-non-portable-shell.pl: `wc -l` may have leading WS

Merge branch 'rs/use-argv-array-in-child-process'

2018-01-05T21:28:10Z

Code cleanup. * rs/use-argv-array-in-child-process: send-pack: use internal argv_array of struct child_process http: use internal argv_array of struct child_process

Merge branch 'ld/p4-multiple-shelves'

2018-01-05T21:28:10Z

"git p4" update. * ld/p4-multiple-shelves: git-p4: update multiple shelved change lists

Merge branch 'jd/fix-strbuf-add-urlencode-bytes'

2018-01-05T21:28:10Z

Bytes with high-bit set were encoded incorrectly and made credential helper fail. * jd/fix-strbuf-add-urlencode-bytes: strbuf: fix urlencode format string on signed char

Merge branch 'ew/empty-merge-with-dirty-index'

2018-01-05T21:28:09Z

"git merge -s recursive" did not correctly abort when the index is dirty, if the merged tree happened to be the same as the current HEAD, which has been fixed. * ew/empty-merge-with-dirty-index: merge-recursive: avoid incorporating uncommitted changes in a merge move index_has_changes() from builtin/am.c to merge.c for reuse t6044: recursive can silently incorporate dirty changes in a merge

Merge branch 'db/doc-config-section-names-with-bs'

2018-01-05T21:28:09Z

Doc update. * db/doc-config-section-names-with-bs: config.txt: document behavior of backslashes in subsections

Merge branch 'jk/test-suite-tracing'

2018-01-05T21:28:09Z

Assorted fixes around running tests with "-x" tracing option. * jk/test-suite-tracing: t/Makefile: introduce TEST_SHELL_PATH test-lib: make "-x" work with "--verbose-log" t5615: avoid re-using descriptor 4 test-lib: silence "-x" cleanup under bash