git, branch v2.32.0-rc0

Git 2.32-rc0

2021-05-16T12:05:24Z

Signed-off-by: Junio C Hamano

Merge branch 'ls/typofix'

2021-05-16T12:05:24Z

* ls/typofix: pretty: fix a typo in the documentation for %(trailers)

Merge branch 'dl/stash-show-untracked-fixup'

2021-05-16T12:05:24Z

The code to handle options recently added to "git stash show" around untracked part of the stash segfaulted when these options were used on a stash entry that does not record untracked part. * dl/stash-show-untracked-fixup: stash show: fix segfault with --{include,only}-untracked t3905: correct test title

Merge branch 'wc/packed-ref-removal-cleanup'

2021-05-16T12:05:24Z

When "git update-ref -d" removes a ref that is packed, it left empty directories under $GIT_DIR/refs/ for * wc/packed-ref-removal-cleanup: refs: cleanup directories when deleting packed ref

Merge branch 'lh/maintenance-leakfix'

2021-05-16T12:05:24Z

* lh/maintenance-leakfix: maintenance: fix two memory leaks

Merge branch 'ma/typofixes'

2021-05-16T12:05:24Z

A couple of trivial typofixes. * ma/typofixes: pretty-formats.txt: add missing space git-repack.txt: remove spurious ")"

Merge branch 'ah/merge-ort-i18n'

2021-05-16T12:05:23Z

An i18n fix. * ah/merge-ort-i18n: merge-ort: split "distinct types" message into two translatable messages

Merge branch 'dd/mailinfo-quoted-cr'

2021-05-16T12:05:23Z

"git mailinfo" (hence "git am") learned the "--quoted-cr" option to control how lines ending with CRLF wrapped in base64 or qp are handled. * dd/mailinfo-quoted-cr: am: learn to process quoted lines that ends with CRLF mailinfo: allow stripping quoted CR without warning mailinfo: allow squelching quoted CRLF warning mailinfo: warn if CRLF found in decoded base64/QP email mailinfo: stop parsing options manually mailinfo: load default metainfo_charset lazily

Merge branch 'ab/sparse-index-cleanup'

2021-05-16T12:05:23Z

Code clean-up. * ab/sparse-index-cleanup: sparse-index.c: remove set_index_sparse_config()

Merge branch 'ab/streaming-simplify'

2021-05-16T12:05:23Z

Code clean-up. * ab/streaming-simplify: streaming.c: move {open,close,read} from vtable to "struct git_istream" streaming.c: stop passing around "object_info *" to open() streaming.c: remove {open,close,read}_method_decl() macros streaming.c: remove enum/function/vtbl indirection streaming.c: avoid forward declarations