git, branch v2.48.0-rc1

Git 2.48-rc1

2024-12-30T14:58:28Z

Signed-off-by: Junio C Hamano

Merge branch 'ms/t7611-test-path-is-file'

2024-12-30T14:56:28Z

Test modernization. * ms/t7611-test-path-is-file: t7611: replace test -f with test_path_is* helpers

Merge branch 'ps/meson-test-wo-gitweb'

2024-12-28T20:20:35Z

meson-based build without GitWeb failed the self tests. * ps/meson-test-wo-gitweb: meson: enable auto-discovered "gitweb" GIT-BUILD-OPTIONS: wire up NO_GITWEB option GIT-BUILD-OPTIONS: sort variables alphabetically

Merge branch 'as/gitk-git-gui-repo-update'

2024-12-28T18:11:42Z

The developer documentation has been updated to give the latest info on gitk and git-gui maintainer. * as/gitk-git-gui-repo-update: Update the official repo of gitk

meson: enable auto-discovered "gitweb"

2024-12-27T16:17:19Z

In 7d549fe317 (meson: skip gitweb build when Perl is disabled, 2024-12-20) we have started to conditionally enable "gitweb" based on whether or not Perl is enabled. By accident though that change causes us to not build gitweb in case its feature flag is set to "auto" even if autoconfiguration determines that it could be built. This is because we use "gitweb_option.enabled()", which only checks whether the feature has been explicitly enabled. Fix the issue by using `gitweb_option.allowed()` instead, which returns true in case it is either explicitly enabled or set to "auto". This also works for the case where the feature becomes auto-disabled due to Perl not being present because we use `disable_auto_if(not perl.found())`. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

GIT-BUILD-OPTIONS: wire up NO_GITWEB option

2024-12-27T16:17:19Z

Building our "gitweb" interface is optional in our Makefile and in Meson and not wired up at all with CMake, but disabling it causes a couple of tests in the t950* range that pull in "t/lib-gitweb.sh". This is because the test library knows to execute gitweb-tests based on whether or not Perl is available, but we may have Perl available and still end up not building gitweb e.g. with `make test NO_GITWEB=YesPlease`. Fix this issue by wiring up a new "NO_GITWEB" build option so that we can skip these tests in case gitweb is not built. Note that this new build option requires us to move the configuration of GIT-BUILD-OPTIONS to a later point in our Meson build instructions. But as that file is only consumed by our tests at runtime this change does not cause any issues. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

GIT-BUILD-OPTIONS: sort variables alphabetically

2024-12-27T16:17:19Z

The variables declared and substituted in GIT-BUILD-OPTIONS are not ordered in any obvious way. Sort them alphabetically so that it becomes obvious where new variables should go. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

t7611: replace test -f with test_path_is* helpers

2024-12-27T16:13:59Z

Replace `test -f` and `test ! -f` with `test_path_is_file` and `test_path_is_missing` for better debuggability. While `test -f` ensures that the file exists and is a regular file, `test_path_is_file` provides clearer error messages on failure. On the other hand, `test ! -f` checks either the absence of a regular file or the presence of any other filesystem object, but looking at them in the test individually, all of them should've said `test ! -e`, i.e. "there shouldn't be anything at given path on filesystem." Replace these cases with `test_path_is_missing` for better debuggability. Helped-by: karthik nayak Helped-by: Junio C Hamano Signed-off-by: Meet Soni Signed-off-by: Junio C Hamano

Update the official repo of gitk

2024-12-26T16:06:42Z

Point out: - current maintaner - contribution flow is via the mailing list Signed-off-by: Alexander Shopov Signed-off-by: Junio C Hamano

Merge https://github.com/j6t/git-gui

2024-12-26T16:02:23Z

* 'master' of https://github.com/j6t/git-gui: git-gui: use system encoding to show console output git-gui: Remove forced rescan of stat-dirty files.