git, branch v2.40.0-rc1

Git 2.40-rc1

2023-03-01T16:13:35Z

Signed-off-by: Junio C Hamano

A bit more before 2.40-rc1

2023-03-01T00:38:47Z

Signed-off-by: Junio C Hamano

Merge branch 'ar/test-lib-remove-stale-comment'

2023-03-01T00:38:47Z

Test library clean-up. * ar/test-lib-remove-stale-comment: test-lib: drop comment about test_description

Merge branch 'zy/t9700-style'

2023-03-01T00:38:47Z

Test style fixes. * zy/t9700-style: t9700: modernize test scripts

Merge branch 'pw/rebase-i-parse-fix'

2023-03-01T00:38:47Z

Fixes to code that parses the todo file used in "rebase -i". * pw/rebase-i-parse-fix: rebase -i: fix parsing of "fixup -C" rebase -i: match whole word in is_command()

Merge branch 'jk/http-test-fixes'

2023-03-01T00:38:47Z

Various fix-ups on HTTP tests. * jk/http-test-fixes: t5559: make SSL/TLS the default t5559: fix test failures with LIB_HTTPD_SSL t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c t/lib-httpd: respect $HTTPD_PROTO in expect_askpass() t5551: drop curl trace lines without headers t5551: handle v2 protocol in cookie test t5551: simplify expected cookie file t5551: handle v2 protocol in upload-pack service test t5551: handle v2 protocol when checking curl trace t5551: stop forcing clone to run with v0 protocol t5551: handle HTTP/2 when checking curl trace t5551: lower-case headers in expected curl trace t5551: drop redundant grep for Accept-Language t5541: simplify and move "no empty path components" test t5541: stop marking "used receive-pack service" test as v0 only t5541: run "used receive-pack service" test earlier

A bit more before 2.40-rc1

2023-02-27T18:08:58Z

Signed-off-by: Junio C Hamano

Merge branch 'if/simplify-trace-setup'

2023-02-27T18:08:58Z

Code clean-up. * if/simplify-trace-setup: trace.c, git.c: remove unnecessary parameter to trace_repo_setup()

Merge branch 'jc/countermand-format-attach'

2023-02-27T18:08:57Z

The format.attach configuration variable lacked a way to override a value defined in a lower-priority configuration file (e.g. the system one) by redefining it in a higher-priority configuration file. Now, setting format.attach to an empty string means show the patch inline in the e-mail message, without using MIME attachment. This is a backward incompatible change. * jc/countermand-format-attach: format.attach: allow empty value to disable multi-part messages

Merge branch 'jk/shorten-unambiguous-ref-wo-sscanf'

2023-02-27T18:08:57Z

sscanf(3) used in "git symbolic-ref --short" implementation found to be not working reliably on macOS in UTF-8 locales. Rewrite the code to avoid sscanf() altogether to work it around. * jk/shorten-unambiguous-ref-wo-sscanf: shorten_unambiguous_ref(): avoid sscanf() shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant shorten_unambiguous_ref(): avoid integer truncation