git, branch v2.21.0-rc0

Git 2.21-rc0

2019-02-07T06:05:31Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/add-ignore-errors-bit-assignment-fix'

2019-02-07T06:05:31Z

A hotfix to an incomplete fix made earlier. * jk/add-ignore-errors-bit-assignment-fix: add_to_index(): convert forgotten HASH_RENORMALIZE check

Merge branch 'rj/sparse-flags'

2019-02-07T06:05:30Z

Use of the sparse tool got easier to customize from the command line to help developers. * rj/sparse-flags: Makefile: improve SPARSE_FLAGS customisation config.mak.uname: remove obsolete SPARSE_FLAGS setting

Merge branch 'bc/fetch-pack-clear-alternate-shallow'

2019-02-07T06:05:30Z

"git fetch" over protocol v2 that needs to make a second connection to backfill tags did not clear a variable that holds shallow repository information correctly, leading to an access of freed piece of memory. * bc/fetch-pack-clear-alternate-shallow: fetch-pack: clear alternate shallow in one more place fetch-pack: clear alternate shallow when complete

Merge branch 'ma/doc-diff-usage-fix'

2019-02-07T06:05:30Z

Running "Documentation/doc-diff x" from anywhere other than the top-level of the working tree did not show the usage string correctly, which has been fixed. * ma/doc-diff-usage-fix: doc-diff: don't `cd_to_toplevel`

Merge branch 'ab/diff-tree-doc-fix'

2019-02-07T06:05:29Z

Doc fix. * ab/diff-tree-doc-fix: diff-tree doc: correct & remove wrong documentation

Merge branch 'ss/describe-dirty-in-the-right-directory'

2019-02-07T06:05:29Z

"git --work-tree=$there --git-dir=$here describe --dirty" did not work correctly as it did not pay attention to the location of the worktree specified by the user by mistake, which has been corrected. * ss/describe-dirty-in-the-right-directory: t6120: test for describe with a bare repository describe: setup working tree for --dirty

Merge branch 'sg/travis-osx-brew-breakage-workaround'

2019-02-07T06:05:28Z

The way the OSX build jobs updates its build environment used the "--quiet" option to "brew update" command, but it wasn't all that quiet to be useful. The use of the option has been replaced with an explicit redirection to the /dev/null (which incidentally would have worked around a breakage by recent updates to homebrew, which has fixed itself already). * sg/travis-osx-brew-breakage-workaround: travis-ci: make the OSX build jobs' 'brew update' more quiet

Merge branch 'nd/commit-doc'

2019-02-07T06:05:28Z

Doc update. * nd/commit-doc: git-commit.txt: better description what it does

Merge branch 'sl/const'

2019-02-07T06:05:28Z

Code cleanup. * sl/const: various: tighten constness of some local variables