git, branch v2.27.0-rc0

Git 2.27-rc0

2020-05-14T21:39:45Z

Signed-off-by: Junio C Hamano

Merge branch 'es/trace-log-progress'

2020-05-14T21:39:45Z

Teach codepaths that show progress meter to also use the start_progress() and the stop_progress() calls as a "region" to be traced. * es/trace-log-progress: trace2: log progress time and throughput

Merge branch 'jt/t5500-unflake'

2020-05-14T21:39:45Z

Test fix for a topic already in 'master' and meant for 'maint'. * jt/t5500-unflake: t5500: count objects through stderr, not trace

Merge branch 'sn/midx-repack-with-config'

2020-05-14T21:39:44Z

"git multi-pack-index repack" has been taught to honor some repack.* configuration variables. * sn/midx-repack-with-config: multi-pack-index: respect repack.packKeptObjects=false midx: teach "git multi-pack-index repack" honor "git repack" configurations

Merge branch 'ds/bloom-cleanup'

2020-05-14T21:39:44Z

Code cleanup and typofixes * ds/bloom-cleanup: completion: offer '--(no-)patch' among 'git log' options bloom: use num_changes not nr for limit detection bloom: de-duplicate directory entries Documentation: changed-path Bloom filters use byte words bloom: parse commit before computing filters test-bloom: fix usage typo bloom: fix whitespace around tab length

Merge branch 'rs/fsck-duplicate-names-in-trees'

2020-05-14T21:39:44Z

"git fsck" ensures that the paths recorded in tree objects are sorted and without duplicates, but it failed to notice a case where a blob is followed by entries that sort before a tree with the same name. This has been corrected. * rs/fsck-duplicate-names-in-trees: fsck: report non-consecutive duplicate names in trees

Merge branch 'ao/p4-d-f-conflict-recover'

2020-05-14T21:39:43Z

"git p4" learned to recover from a (broken) state where a directory and a file are recorded at the same path in the Perforce repository the same way as their clients do. * ao/p4-d-f-conflict-recover: git-p4: recover from inconsistent perforce history

Merge branch 'js/rebase-autosquash-double-fixup-fix'

2020-05-14T21:39:43Z

"rebase -i" segfaulted when rearranging a sequence that has a fix-up that applies another fix-up (which may or may not be a fix-up of yet another step). * js/rebase-autosquash-double-fixup-fix: rebase --autosquash: fix a potential segfault

Merge branch 'jc/codingstyle-compare-with-null'

2020-05-14T21:39:42Z

Doc update. * jc/codingstyle-compare-with-null: CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL

Merge branch 'cw/bisect-replay-with-dos'

2020-05-14T21:39:41Z

"git bisect replay" had trouble with input files when they used CRLF line ending, which has been corrected. * cw/bisect-replay-with-dos: bisect: allow CRLF line endings in "git bisect replay" input