git, branch v2.24.0-rc2

Git 2.24-rc2

2019-10-30T06:13:14Z

Signed-off-by: Junio C Hamano

Merge branch 'wb/fsmonitor-bitmap-fix'

2019-10-30T06:13:14Z

Comment update. * wb/fsmonitor-bitmap-fix: t7519-status-fsmonitor: improve comments

Merge branch 'rl/gitweb-blame-prev-fix'

2019-10-30T06:13:13Z

Fix a rather old bug in gitweb---incremental blame output in javascript actions mode never worked. * rl/gitweb-blame-prev-fix: gitweb: correctly store previous rev in javascript-actions mode

Merge branch 'js/mingw-needs-hiding-fix'

2019-10-30T06:13:13Z

Fix for a (rather old) buffer-overrun bug. * js/mingw-needs-hiding-fix: mingw: avoid a buffer overrun in `needs_hiding()`

t7519-status-fsmonitor: improve comments

2019-10-30T02:52:18Z

The comments for the staging/unstaging test did not accurately describe the scenario being tested. It is not essential that the test files being staged/unstaged appear at the end of the index. All that is required is that the test files are not flagged with CE_FSMONITOR_VALID and have a position in the index greater than the number of entries in the index after unstaging. The comment for this test has been updated to be more accurate with respect to the scenario that's being tested. Signed-off-by: William Baker Signed-off-by: Junio C Hamano

mingw: avoid a buffer overrun in `needs_hiding()`

2019-10-28T03:38:51Z

When this function is passed a path with a trailing slash, it runs right over the end of that path. Let's fix this. Co-authored-by: Alexandr Miloslavskiy Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

gitweb: correctly store previous rev in javascript-actions mode

2019-10-28T02:06:57Z

Without this change, the setting $feature{'javascript-actions'}{'default'} = [1]; in gitweb.conf breaks gitweb's blame page: clicking on line numbers displayed in the second column on the page has no effect. For comparison, with javascript-actions disabled, clicking on line numbers loads the previous version of the line. Addresses https://bugs.debian.org/741883. Signed-off-by: Jonathan Nieder Signed-off-by: Robert Luberda Acked-by: Jakub Narębski Signed-off-by: Junio C Hamano

Git 2.24-rc1

2019-10-24T04:34:03Z

Signed-off-by: Junio C Hamano

Merge branch 'sg/ci-osx-gcc8-fix'

2019-10-24T04:34:03Z

CI build fix. * sg/ci-osx-gcc8-fix: ci: fix GCC install in the Travis CI GCC OSX job

Merge branch 'ds/feature-macros'

2019-10-24T04:34:03Z

The codepath that reads the index.version configuration was broken with a recent update, which has been corrected. * ds/feature-macros: repo-settings: read an int for index.version