git, branch v2.50.0-rc2

Git 2.50-rc2

2025-06-09T14:18:49Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/test-in-absolute-home'

2025-06-09T14:15:51Z

Tests that compare $HOME and $(pwd), which should be the same directory unless the tests chdir's around, would fail when the user enters the test directory via symbolic links, which has been corrected. * mm/test-in-absolute-home: t: run tests from a normalized working directory

A bit more before -rc2

2025-06-07T17:46:51Z

Signed-off-by: Junio C Hamano

Merge branch 'js/curl-easy-setopt-typefix'

2025-06-07T17:46:50Z

Adjust to newer version of libcURL. * js/curl-easy-setopt-typefix: curl: pass `long` values where expected

Merge branch 'jk/curl-easy-setopt-typefix'

2025-06-07T17:46:50Z

Adjust to newer version of libcURL. * jk/curl-easy-setopt-typefix: curl: fix symbolic constant typechecks with curl_easy_setopt() curl: fix integer variable typechecks with curl_easy_setopt() curl: fix integer constant typechecks with curl_easy_setopt()

Merge branch 'bs/bsd-wo-specific-xopen-source'

2025-06-07T17:46:50Z

Build fix for BSDs. * bs/bsd-wo-specific-xopen-source: compat: fixes for header handling with OpenBSD / NetBSD

Merge branch 'cf/var-completion-obsd-fixes'

2025-06-07T17:46:49Z

Build fix for OpenBSD. * cf/var-completion-obsd-fixes: completion: make sed command that generates config-list.h portable.

Merge branch 'master' of https://github.com/j6t/git-gui

2025-06-06T16:41:59Z

* 'master' of https://github.com/j6t/git-gui: git-gui: don't delete source files when auto_mkindex fails

curl: pass `long` values where expected

2025-06-06T15:12:24Z

As of Homebrew's update to cURL v8.14.0, there are new compile errors to be observed in the `osx-gcc` job of Git's CI builds: In file included from http.h:8, from imap-send.c:36: In function 'setup_curl', inlined from 'curl_append_msgs_to_imap' at imap-send.c:1460:9, inlined from 'cmd_main' at imap-send.c:1581:9: /usr/local/Cellar/curl/8.14.0/include/curl/typecheck-gcc.h:50:15: error: call to '_curl_easy_setopt_err_long' declared with attribute warning: curl_easy_setopt expects a long argument [-Werror=attribute-warning] 50 | _curl_easy_setopt_err_long(); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/Cellar/curl/8.14.0/include/curl/curl.h:54:7: note: in definition of macro 'CURL_IGNORE_DEPRECATION' 54 | statements \ | ^~~~~~~~~~ imap-send.c:1423:9: note: in expansion of macro 'curl_easy_setopt' 1423 | curl_easy_setopt(curl, CURLOPT_PORT, srvc->port); | ^~~~~~~~~~~~~~~~ [... many more instances of nearly identical warnings...] See for example this CI workflow run: https://github.com/git/git/actions/runs/15454602308/job/43504278284#step:4:307 The most likely explanation is the entry "typecheck-gcc.h: fix the typechecks" in cURL's release notes (https://curl.se/ch/8.14.0.html). Nearly identical compile errors afflicted recently-updated Debian setups, which have been addressed by `jk/curl-easy-setopt-typefix`. However, on macOS Git is built with different build options, which uncovered more instances of `int` values that need to be cast to constants, which were not covered by 6f11c42e8edc (curl: fix integer constant typechecks with curl_easy_setopt(), 2025-06-04). Let's explicitly convert even those remaining `int` constants in `curl_easy_setopt()` calls to `long` parameters. In addition to looking at the compile errors of the `osx-gcc` job, I verified that there are no other instances of the same issue that need to be handled in this manner (and that might not be caught by our CI builds because of yet other build options that might skip those code parts), I ran the following command and inspected all 23 results manually to ensure that the fix is now actually complete: git grep -n curl_easy_setopt | grep -ve ',.*, *[A-Za-z_"&]' \ -e ',.*, *[-0-9]*L)' \ -e ',.*,.* (long)' Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

git-gui: don't delete source files when auto_mkindex fails

2025-06-06T05:43:37Z

Commit 2cc5b0facfa4 (git-gui: extract script to generate "tclIndex", 2025-03-11) converted commands in a Makefile rule to a shell script. In this process, the Makefile variable $@ had to be replaced by the file name that it represents, 'lib/tclIndex'. However, the occurrence in `rm -f $@` was missed. In a shell script, $@ expands to all command line arguments, which happen to be the source files lib/*.tcl in this case. Needless to say that we do not want to remove source files during a build. Replace $@ by the intended 'lib/tclIndex'. Reported-by: Randall S. Becker Signed-off-by: Johannes Sixt