Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
73876f4 Junio C Hamano 12 March 2023, 21:34:41 UTC Git 2.40 Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 March 2023, 21:34:41 UTC
5db135c Junio C Hamano 12 March 2023, 21:33:14 UTC Merge tag 'l10n-2.40.0-rnd1' of https://github.com/git-l10n/git-po l10n-2.40.0-rnd1 * tag 'l10n-2.40.0-rnd1' of https://github.com/git-l10n/git-po: l10n: zh_CN v2.40.0 round 1 l10n: update German translation l10n: tr: Update Turkish translations for v.2.40.0 l10n: fr: v2.40.0 rnd 2 l10n: fr: v2.40.0 rnd 1 l10n: fr: fix some typos l10n: po-id for 2.40 (round 1) l10n: sv.po: Update Swedish translation (5490t0f0u) l10n: bg.po: Updated Bulgarian translation (5490t) l10n: Update Catalan translation 12 March 2023, 21:33:14 UTC
3dbb0ff Jiang Xin 10 March 2023, 14:50:14 UTC Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po * 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.40.0 round 1 10 March 2023, 14:50:14 UTC
c35e313 Jiang Xin 08 March 2023, 01:10:20 UTC Merge branch 'l10n-de-2.40' of github.com:ralfth/git * 'l10n-de-2.40' of github.com:ralfth/git: l10n: update German translation 08 March 2023, 01:10:20 UTC
680f605 Jiang Xin 08 March 2023, 00:28:02 UTC Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.40 (round 1) 08 March 2023, 00:28:02 UTC
62931b5 Jiang Xin 08 March 2023, 00:27:07 UTC Merge branch 'catalan' of github.com:Softcatala/git-po * 'catalan' of github.com:Softcatala/git-po: l10n: Update Catalan translation 08 March 2023, 00:27:07 UTC
2deb48a Jiang Xin 08 March 2023, 00:26:00 UTC Merge branch 'fr_2.40.0_rnd1' of github.com:jnavila/git * 'fr_2.40.0_rnd1' of github.com:jnavila/git: l10n: fr: v2.40.0 rnd 2 l10n: fr: v2.40.0 rnd 1 l10n: fr: fix some typos 08 March 2023, 00:26:00 UTC
ae9b8c4 Jiang Xin 08 March 2023, 00:25:07 UTC Merge branch 'master' of github.com:nafmo/git-l10n-sv * 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (5490t0f0u) 08 March 2023, 00:25:07 UTC
4623668 Jiang Xin 08 March 2023, 00:23:16 UTC Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5490t) 08 March 2023, 00:23:16 UTC
93a05aa Jiang Xin 08 March 2023, 00:22:01 UTC Merge branch 'turkish' of github.com:bitigchi/git-po * 'turkish' of github.com:bitigchi/git-po: l10n: tr: Update Turkish translations for v.2.40.0 08 March 2023, 00:22:01 UTC
cec74d0 Fangyi Zhou 07 March 2023, 23:42:30 UTC l10n: zh_CN v2.40.0 round 1 Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io> 07 March 2023, 23:42:30 UTC
725f570 Junio C Hamano 07 March 2023, 05:53:11 UTC Git 2.40-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 March 2023, 05:53:11 UTC
9a4e18b Junio C Hamano 07 March 2023, 05:51:56 UTC Merge branch 'gm/signature-format-doc' Doc update. * gm/signature-format-doc: signature-format.txt: note SSH and X.509 signature delimiters 07 March 2023, 05:51:56 UTC
5e10456 Ralf Thielow 03 March 2023, 16:23:10 UTC l10n: update German translation Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 06 March 2023, 16:33:21 UTC
8790c93 Emir SARI 25 February 2023, 10:53:07 UTC l10n: tr: Update Turkish translations for v.2.40.0 Signed-off-by: Emir SARI <emir_sari@icloud.com> 03 March 2023, 08:34:51 UTC
81fba8e Jean-Noël Avila 02 March 2023, 17:45:05 UTC l10n: fr: v2.40.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 02 March 2023, 17:49:13 UTC
1f7012f Jean-Noël Avila 27 February 2023, 19:58:56 UTC l10n: fr: v2.40.0 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 02 March 2023, 17:41:06 UTC
90c6ff5 Jean-Noël Avila 31 December 2022, 15:37:33 UTC l10n: fr: fix some typos Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Reported-by: Andrei Rybak <rybak.a.v@gmail.com> 02 March 2023, 17:41:06 UTC
2e6b49d Bagas Sanjaya 01 March 2023, 09:00:12 UTC l10n: po-id for 2.40 (round 1) Update following components: * archive.c * attr.c * builtin/add.c * builtin/rebase.c * bundle.c * connect.c * sequencer.c * t/helper/test-bundle-uri.c * transport.c * wt-status.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> 02 March 2023, 12:48:13 UTC
8cb7de6 Peter Krefting 02 March 2023, 08:35:41 UTC l10n: sv.po: Update Swedish translation (5490t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 02 March 2023, 08:35:41 UTC
b0c48e4 Alexander Shopov 25 February 2023, 15:14:56 UTC l10n: bg.po: Updated Bulgarian translation (5490t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 02 March 2023, 06:56:33 UTC
d15644f Junio C Hamano 01 March 2023, 21:25:24 UTC Merge branch 'rs/range-diff-custom-abbrev-fix' Hotfix for a topic that is already in 'master'. * rs/range-diff-custom-abbrev-fix: range-diff: avoid compiler warning when char is unsigned 01 March 2023, 21:25:24 UTC
cdda119 Jordi Mas 01 March 2023, 21:07:24 UTC l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> 01 March 2023, 21:07:24 UTC
ef7d4f5 Junio C Hamano 01 March 2023, 16:13:35 UTC Git 2.40-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 March 2023, 16:13:35 UTC
454dfcb Junio C Hamano 28 February 2023, 23:42:20 UTC A bit more before 2.40-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 March 2023, 00:38:47 UTC
4240e0f Junio C Hamano 01 March 2023, 00:38:47 UTC Merge branch 'ar/test-lib-remove-stale-comment' Test library clean-up. * ar/test-lib-remove-stale-comment: test-lib: drop comment about test_description 01 March 2023, 00:38:47 UTC
8760a2b Junio C Hamano 01 March 2023, 00:38:47 UTC Merge branch 'zy/t9700-style' Test style fixes. * zy/t9700-style: t9700: modernize test scripts 01 March 2023, 00:38:47 UTC
a2d2b52 Junio C Hamano 01 March 2023, 00:38:47 UTC Merge branch 'pw/rebase-i-parse-fix' Fixes to code that parses the todo file used in "rebase -i". * pw/rebase-i-parse-fix: rebase -i: fix parsing of "fixup -C<commit>" rebase -i: match whole word in is_command() 01 March 2023, 00:38:47 UTC
b2893ea Junio C Hamano 01 March 2023, 00:38:47 UTC Merge branch 'jk/http-test-fixes' 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 01 March 2023, 00:38:47 UTC
d9165be René Scharfe 28 February 2023, 16:13:27 UTC range-diff: avoid compiler warning when char is unsigned Since 2b15969f61 (range-diff: let '--abbrev' option takes effect, 2023-02-20), GCC 11.3 on Ubuntu 22.04 on aarch64 warns (and errors out if the make variable DEVELOPER is set): range-diff.c: In function ‘output_pair_header’: range-diff.c:388:20: error: comparison is always false due to limited range of data type [-Werror=type-limits] 388 | if (abbrev < 0) | ^ cc1: all warnings being treated as errors That's because char is unsigned on that platform. Use int instead, just like in struct diff_options, to copy the value faithfully. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 February 2023, 22:43:05 UTC
31a431b Gwyneth Morgan 27 February 2023, 20:27:18 UTC signature-format.txt: note SSH and X.509 signature delimiters This document only explains PGP signatures, but Git now supports X.509 signatures as of 1e7adb9756 (gpg-interface: introduce new signature format "x509" using gpgsm, 2018-07-17), and SSH signatures as of 29b315778e (ssh signing: add ssh key format and signing code, 2021-09-10). Additionally, explain that these signature formats are controlled `gpg.format`, linking to its documentation, and explain in said `gpg.format` documentation that the underlying signature format is documented in signature-format.txt. Signed-off-by: Gwyneth Morgan <gwymor@tilde.club> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 February 2023, 21:42:43 UTC
a0f05f6 Junio C Hamano 27 February 2023, 18:06:20 UTC A bit more before 2.40-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 February 2023, 18:08:58 UTC
506bd0e Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'if/simplify-trace-setup' Code clean-up. * if/simplify-trace-setup: trace.c, git.c: remove unnecessary parameter to trace_repo_setup() 27 February 2023, 18:08:58 UTC
630501c Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'jc/countermand-format-attach' 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 27 February 2023, 18:08:57 UTC
dda83e6 Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'jk/shorten-unambiguous-ref-wo-sscanf' 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 27 February 2023, 18:08:57 UTC
7dc55a0 Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'mh/credential-password-expiry' The credential subsystem learned that a password may have an explicit expiration. * mh/credential-password-expiry: credential: new attribute password_expiry_utc 27 February 2023, 18:08:57 UTC
5e572aa Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'rs/archive-mtime' "git archive HEAD^{tree}" records the paths with the current timestamp in the archive, making it harder to obtain a stable output. The command learned the --mtime option to specify an arbitrary timestamp (e.g. --mtime="@0 +0000" for the epoch). * rs/archive-mtime: archive: add --mtime 27 February 2023, 18:08:57 UTC
b8840a7 Junio C Hamano 27 February 2023, 18:08:57 UTC Merge branch 'tb/drop-dir-iterator-follow-symlink-bit' Remove leftover and unused code. * tb/drop-dir-iterator-follow-symlink-bit: t0066: drop setup of "dir5" dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` 27 February 2023, 18:08:57 UTC
63f74cf Junio C Hamano 27 February 2023, 18:08:56 UTC Merge branch 'tl/range-diff-custom-abbrev' "git range-diff" learned --abbrev=<num> option. * tl/range-diff-custom-abbrev: range-diff: let '--abbrev' option takes effect 27 February 2023, 18:08:56 UTC
93c1272 Junio C Hamano 27 February 2023, 18:08:56 UTC Merge branch 'ap/t2015-style-update' Test clean-up. * ap/t2015-style-update: t2015-checkout-unborn.sh: changes the style for cd 27 February 2023, 18:08:56 UTC
ece8dc9 Junio C Hamano 27 February 2023, 18:08:56 UTC Merge branch 'jc/diff-algo-attribute' The "diff" drivers specified by the "diff" attribute attached to paths can now specify which algorithm (e.g. histogram) to use. * jc/diff-algo-attribute: diff: teach diff to read algorithm from diff driver diff: consolidate diff algorithm option parsing 27 February 2023, 18:08:56 UTC
21522cf Junio C Hamano 27 February 2023, 18:08:56 UTC Merge branch 'pw/rebase-i-validate-labels-early' An invalid label or ref in the "rebase -i" todo file used to trigger an runtime error. SUch an error is now diagnosed while the todo file is parsed. * pw/rebase-i-validate-labels-early: rebase -i: check labels and refs when parsing todo list 27 February 2023, 18:08:56 UTC
c600a91 Andrei Rybak 26 February 2023, 10:53:03 UTC test-lib: drop comment about test_description When a comment describing how each test file should start was added in commit [1], it was the second comment of t/test-lib.sh. The comment describes how variable "test_description" is supposed to be assigned at the top of each test file and how "test-lib.sh" should be used by sourcing it. However, even in [1], the comment was ten lines away from the usage of the variable by test-lib.sh. Since then, the comment has drifted away both from the top of the file and from the usage of the variable. The comment just sits in the middle of the initialization of the test library, surrounded by unrelated code, almost one hundred lines away from the usage of "test_description". Nobody has noticed this drift during evolution of test-lib.sh, which suggests that this comment has outlived its usefulness. The assignment of "test_description", sourcing of "test-lib.sh" by tests, and the process of writing tests in general are described in detail in "t/README". So drop the obsolete comment. An alternative solution could be to move the comment either to the top of the file, or down to the usage of variable "test_description". [1] e1970ce43a ("[PATCH 1/2] Test framework take two.", 2005-05-13) Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 February 2023, 17:25:34 UTC
509d3f5 Zhang Yi 25 February 2023, 01:30:03 UTC t9700: modernize test scripts The style of t9700-perl-git.sh is old. There are 3 problems: * A title is not on the same line with test_expect_success command. * A test body is indented by whitespaces. * There are whitespaces after redirect operators. Modernize test scripts by: * Combine the title with test_expect_success command. * Replace whitespace indents with TAB. * Delete whitespaces after redirect operators. Signed-off-by: Zhang Yi <18994118902@163.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2023, 20:20:06 UTC
dadc8e6 Junio C Hamano 25 February 2023, 06:53:08 UTC A few more topics post 2.40-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 February 2023, 06:54:01 UTC
f96dd8c Junio C Hamano 25 February 2023, 06:54:01 UTC Merge branch 'ps/free-island-marks' Fix on a previous fix already in 'master'. * ps/free-island-marks: delta-islands: fix segfault when freeing island marks 25 February 2023, 06:54:01 UTC
6f581b6 Junio C Hamano 25 February 2023, 06:54:01 UTC Merge branch 'jk/http-proxy-tests' Test updates. * jk/http-proxy-tests: add basic http proxy tests 25 February 2023, 06:54:01 UTC
d180cc2 Junio C Hamano 25 February 2023, 06:54:00 UTC Merge branch 'ma/fetch-parallel-use-online-cpus' "git fetch --jobs=0" used to hit a BUG(), which has been corrected to use the available CPUs. * ma/fetch-parallel-use-online-cpus: fetch: choose a sensible default with --jobs=0 again 25 February 2023, 06:54:00 UTC
c5f7ef5 Junio C Hamano 24 February 2023, 19:32:40 UTC Git 2.40-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 February 2023, 19:32:40 UTC
deb32d6 Junio C Hamano 24 February 2023, 19:32:30 UTC Merge branch 'jc/genzeros-avoid-raw-write' A test helper had a single write(2) of 256kB, which was too big for some platforms (e.g. NonStop), which has been corrected by using xwrite() wrapper appropriately. * jc/genzeros-avoid-raw-write: test-genzeros: avoid raw write(2) 24 February 2023, 19:32:30 UTC
a7981d0 Junio C Hamano 24 February 2023, 19:32:29 UTC Merge branch 'rd/doc-default-date-format' Update --date=default documentation. * rd/doc-default-date-format: rev-list: clarify git-log default date format 24 February 2023, 19:32:30 UTC
38a227b Junio C Hamano 24 February 2023, 19:32:29 UTC Merge branch 'js/gpg-errors' Error messages given upon a signature verification failure used to discard the errors from underlying gpg program, which has been corrected. * js/gpg-errors: gpg: do show gpg's error message upon failure t7510: add a test case that does not need gpg 24 February 2023, 19:32:29 UTC
9861932 Junio C Hamano 24 February 2023, 19:32:29 UTC Merge branch 'rs/ctype-test' Test safe_ctype * rs/ctype-test: test-ctype: test iscntrl, ispunct, isxdigit and isprint test-ctype: test islower and isupper test-ctype: test isascii 24 February 2023, 19:32:29 UTC
666b6e1 Phillip Wood 23 February 2023, 20:55:01 UTC rebase -i: fix parsing of "fixup -C<commit>" If the user omits the space between "-C" and the commit in a fixup command then it is parsed as an ordinary fixup and the commit message is not updated as it should be. Fix this by making the space between "-C" and "<commit>" optional as it is for the "merge" command. Note that set_replace_editor() is changed to set $GIT_SEQUENCE_EDITOR instead of $EDITOR in order to be able to replace the todo list and reword commits with $FAKE_COMMIT_MESSAGE. This is safe as all the existing users are using set_replace_editor() to replace the todo list. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 22:25:50 UTC
7aed2c0 Phillip Wood 23 February 2023, 20:55:00 UTC rebase -i: match whole word in is_command() When matching an unabbreviated command is_command() only does a prefix match which means it parses "pickled" as TODO_PICK. parse_insn_line() does error out because is_command() only advances as far as the end of "pick" so it looks like the command name is not followed by a space but the error message is "missing arguments for pick" rather than telling the user that the "pickled" is not a valid command. Fix this by ensuring the match is follow by whitespace or the end of the string as we already do for abbreviated commands. The (*bol = p) at the end of the condition is a bit cute for my taste but I decided to leave it be for now. Rather than add new tests the existing tests for bad commands are adapted to use a bad command name that triggers the prefix matching bug. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 22:25:48 UTC
8f2146d Jeff King 23 February 2023, 11:08:41 UTC t5559: make SSL/TLS the default The point of t5559 is run the regular t5551 tests with HTTP/2. But it does so with the "h2c" protocol, which uses cleartext upgrades from HTTP/1.1 to HTTP/2 (rather than learning about HTTP/2 support during the TLS negotiation). This has a few problems: - it's not very indicative of the real world. In practice, most servers that support HTTP/2 will also support TLS. - support for upgrading does not seem as robust. In particular, we've run into bugs in some versions of Apache's mod_http2 that trigger only with the upgrade mode. See: https://lore.kernel.org/git/Y8ztIqYgVCPILJlO@coredump.intra.peff.net/ So the upside is that this change makes our HTTP/2 tests more robust and more realistic. The downside is that if we can't set up SSL for any reason, we'll skip the tests (even though you _might_ have been able to run the HTTP/2 tests the old way). We could probably have a conditional fallback, but it would be complicated for little gain, and it's not even clear it would help (i.e., would any test environment even have HTTP/2 but not SSL support?). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:18 UTC
8619002 Jeff King 23 February 2023, 11:07:29 UTC t5559: fix test failures with LIB_HTTPD_SSL One test needs to be tweaked in order for t5559 to pass with SSL/TLS set up. When we make our initial clone, we check that the curl trace of requests is what we expected. But we need to fix two things: - along with ignoring "data" lines from the trace, we need to ignore "SSL data" lines - when TLS is used, the server is able to tell the client (via ALPN) that it supports HTTP/2 before the first HTTP request is made. So rather than request an upgrade using an HTTP header, it can just speak HTTP/2 immediately With this patch, running: LIB_HTTPD_SSL=1 ./t5559-http-fetch-smart-http2.sh works, whereas it did not before. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:17 UTC
3c14419 Jeff King 23 February 2023, 11:06:44 UTC t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c Commit 73c49a4474 (t: run t5551 tests with both HTTP and HTTP/2, 2022-11-11) added Apache config to enable HTTP/2. However, it only enabled the "h2c" protocol, which allows cleartext HTTP/2 (generally based on an upgrade header during an HTTP/1.1 request). This is what t5559 is generally testing, since by default we don't set up SSL/TLS. However, it should be possible to run t5559 with LIB_HTTPD_SSL set. In that case, Apache will advertise support for HTTP/2 via ALPN during the TLS handshake. But we need to tell it support "h2" (the non-cleartext version) to do so. Without that, then curl does not even try to do the HTTP/1.1 upgrade (presumably because after seeing that we did TLS but didn't get the ALPN indicator, it assumes it would be fruitless). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:17 UTC
9d15b1e Jeff King 23 February 2023, 11:05:55 UTC t/lib-httpd: respect $HTTPD_PROTO in expect_askpass() When the HTTP tests are run with LIB_HTTPD_SSL in the environment, then we access the test server as https://. This causes expect_askpass to complain, because it tries to blindly match "http://" in the prompt shown to the user. We can adjust this to use $HTTPD_PROTO, which is set during the setup phase. Note that this is enough for t5551 and t5559 to pass when run with https, but there are similar problems in other scripts that will need to be fixed before the whole suite can run with LIB_HTTPD_SSL. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
b71a2bf Jeff King 23 February 2023, 11:05:07 UTC t5551: drop curl trace lines without headers We pick apart a curl trace, looking for "=> Send header:" and so on, and matching against an expected set of requests and responses. We remove "== Info" lines entirely. However, our parser is fooled when running the test with LIB_HTTPD_SSL on Ubuntu 20.04 (as found in our linux-gcc CI job), as curl hands us an "Info" buffer with a newline, and we get: == Info: successfully set certificate verify locations: == Info: CAfile: /etc/ssl/certs/ca-certificates.crt CApath: /etc/ssl/certs => Send SSL data[...] which results in the "CApath" line ending up in the cleaned-up output, causing the test to fail. Arguably the tracing code should detect this and put it on two separate "== Info" lines. But this is actually a curl bug, fixed by their 80d73bcca (tls: provide the CApath verbose log on its own line, 2020-08-18). It's simpler to just work around it here. Since we are using GIT_TRACE_CURL, every line should just start with one of "<=", "==", or "=>", and we can throw away anything else. In fact, we can just replace the pattern for deleting "*" lines. Those were from the old GIT_CURL_VERBOSE output, but we switched over in 14e24114d9 (t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var, 2016-09-05). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
93ea5bf Jeff King 23 February 2023, 11:02:31 UTC t5551: handle v2 protocol in cookie test After making a request, we check that it stored the expected cookies. This depends on the protocol version, because the cookies we store depend on the exact requests we made (and for ls-remote, v2 will always hit /git-upload-pack to get the refs, whereas v0 is happy with the initial ref advertisement). As a result, hardly anybody runs this test, as you'd have to manually set GIT_TEST_PROTOCOL_VERSION=0 to do so. Let's teach it to handle both protocol versions. One way to do this would be to make the expectation conditional on the protocol used. But there's a simpler solution. The reason that v0 doesn't hit /git-upload-pack is that ls-remote doesn't fetch any objects. If we instead do a fetch (making sure there's an actual object to grab), then both v0 and v2 will hit the same endpoints and set the same cookies. Note that we do have to clean up our new tag here; otherwise it confuses the later "clone 2,000 tags" test. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
87d38af Jeff King 23 February 2023, 11:01:31 UTC t5551: simplify expected cookie file After making an HTTP request that should store cookies, we check that the expected values are in the cookie file. We don't want to look at the whole file, because it has noisy comments at the top that we shouldn't depend on. But we strip out the interesting bits using "tail -3", which is brittle. It requires us to put an extra blank line in our expected output, and it would fail to notice any reordering or extra content in the cookie file. Instead, let's just grep for non-blank lines that are not comments, which more directly describes what we're interested in. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
795d713 Jeff King 23 February 2023, 11:00:38 UTC t5551: handle v2 protocol in upload-pack service test We perform a clone and a fetch, and then check that we saw the expected requests in Apache's access log. In the v2 protocol, there will be one extra request to /git-upload-pack for each operation (since the initial /info/refs probe is just used to upgrade the protocol). As a result, this test is a noop unless the use of the v0 protocol is forced. Which means that hardly anybody runs it, since you have to do so manually. Let's update it to handle v2 and run it always. We could do this by just conditionally adding in the extra POST lines. But if we look at the origin of the test in 7da4e2280c (test smart http fetch and push, 2009-10-30), the point is really just to make sure that the smart git-upload-pack service was used at all. So rather than counting up the individual requests, let's just make sure we saw each of the expected types. This is a bit looser, but makes maintenance easier. Since we're now matching with grep, we can also loosen the HTTP/1.1 match, which allows this test to pass when run with HTTP/2 via t5559. That lets: GIT_TEST_PROTOCOL_VERSION=0 ./t5559-http-fetch-smart-http2.sh run to completion, which previously failed (and of course it works if you use v2, as well). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
1c5a638 Jeff King 23 February 2023, 10:59:00 UTC t5551: handle v2 protocol when checking curl trace After cloning an http repository, we check the curl trace to make sure the expected requests were made. But since the expected trace was never updated to handle v2, it is only run when you ask the test suite to run in v0 mode (which hardly anybody does). Let's update it to handle both protocols. This isn't too hard since v2 just sends an extra header and an extra request. So we can just annotate those extra lines and strip them out for v0 (and drop the annotations for v2). I didn't bother handling v1 here, as it's not really of practical interest (it would drop the extra v2 request, but still have the "git-protocol" lines). There's a similar tweak needed at the end. Since we check the "accept-encoding" value loosely, we grep for it rather than finding it in the verbatim trace. This grep insists that there are exactly 2 matches, but of course in v2 with the extra request there are 3. We could tweak the number, but it's simpler still to just check that we saw at least one match. The verbatim check already confirmed how many instances of the header we have; we're really just checking here that "gzip" is in the value (it's possible, of course, that the headers could have different values, but that seems like an unlikely bug). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
2f87277 Jeff King 23 February 2023, 10:57:27 UTC t5551: stop forcing clone to run with v0 protocol In the "clone http repository" test, we check the curl trace to make sure the expected requests were made. This whole script was marked to handle only the v0 protocol in d790ee1707 (tests: fix protocol version for overspecifications, 2019-02-25). That makes sense, since v2 requires an extra request, so tests as specific as this would fail unless modified. Later, in preparation for v2 becoming the default, this was tweaked by 8a1b0978ab (test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate, 2019-12-23). There we run the trace check only if the user has explicitly asked to test protocol version 0. But it also forced the clone itself to run with the v0 protocol. This makes the check for "can we expect a v0 trace" silly; it will always be v0. But much worse, it means that the clone we are testing is not like the one that normal users would run. They would use the defaults, which are now v2. And since this is supposed to be a basic check of clone-over-http, we should do the same. Let's fix this by dropping the extra v0 override. The test still passes because the trace checking only kicks in if we asked to use v0 explicitly (this is the same as before; even though we were running a v0 clone, unless you specifically set GIT_TEST_PROTOCOL_VERSION=0, the trace check was always skipped). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:15 UTC
8dfe36b Jeff King 23 February 2023, 10:56:17 UTC t5551: handle HTTP/2 when checking curl trace We check that the curl trace of a clone has the lines we expect, but this won't work when we run the test under t5559, because a few details are different under HTTP/2 (but nobody noticed because it only happens when you manually set GIT_TEST_PROTOCOL_VERSION to "0"). We can handle both HTTP protocols with a few tweaks: - we'll drop the HTTP "101 Switching Protocols" response, as well as various protocol upgrade headers. These details aren't interesting to us. We just want to make sure the correct protocol was used (and we do in the main request/response lines). - successful HTTP/2 responses just say "200" and not "200 OK"; we can normalize these - replace HTTP/1.1 with a variable in the request/response lines. We can use the existing $HTTP_PROTO for this, as it's already set to "HTTP/2" when appropriate. We do need to tweak the fallback value to "HTTP/1.1" to match what curl will write (prior to this patch, the fallback value didn't matter at all; we only checked if it was the literal string "HTTP/2"). Note that several lines still expect HTTP/1.1 unconditionally. The first request does so because the client requests an upgrade during the request. The POST request and response do so because you can't do an upgrade if there is a request body. (This will all be different if we trigger HTTP/2 via ALPN, but the tests aren't yet capable of that). This is enough to let: GIT_TEST_PROTOCOL_VERSION=0 ./t5559-http-fetch-smart-http2.sh pass the "clone http repository" test (but there are some other failures later on). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
4a21230 Jeff King 23 February 2023, 10:54:02 UTC t5551: lower-case headers in expected curl trace There's a test in t5551 which checks the curl trace (after simplifying it a bit). It doesn't work with HTTP/2, because in that case curl outputs all of the headers in lower-case. Even though this test is run with HTTP/2 by t5559, nobody has noticed because checking the trace only happens if GIT_TEST_PROTOCOL_VERSION is manually set to "0". Let's fix this by lower-casing all of the header names in the trace, and then checking for those in our expected code (this is easier than making HTTP/2 traces look like HTTP/1.1, since HTTP/1.1 uses title-casing). Sadly, we can't quite do this in our existing sed script. This works if you have GNU sed: s/^\\([><]\\) \\([A-Za-z0-9-]*:\\)/\1 \L\2\E/ but \L is a GNU-ism, and I don't think there's a portable solution. We could just "tr A-Z a-z" on the way in, of course, but that makes the non-header parts harder to read (e.g., lowercase "post" requests). But to paraphrase Baron Munchausen, I have learned from experience that a modicum of Perl can be most efficacious. Note that this doesn't quite get the test passing with t5559; there are more fixes needed on top. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
a58f4d6 Jeff King 23 February 2023, 10:52:10 UTC t5551: drop redundant grep for Accept-Language Commit b0c4adcdd7 (remote-curl: send Accept-Language header to server, 2022-07-11) added tests to make sure the header is sent via HTTP. However, it checks in two places: 1. In the expected trace output, we check verbatim for the header and its value. 2. Afterwards, we grep for the header again in the trace file. This (2) is probably cargo-culted from the earlier grep for Accept-Encoding. It is needed for the encoding because we smudge the value of that header when doing the verbatim check; see 1a53e692af (remote-curl: accept all encodings supported by curl, 2018-05-22). But we don't do so for the language header, so any problem that the "grep" would catch in (2) would already have been caught by (1). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
f1449a5 Jeff King 23 February 2023, 10:51:35 UTC t5541: simplify and move "no empty path components" test Commit 9ee6bcd398 (t5541-http-push: add test for URLs with trailing slash, 2010-04-08) added a test that clones a URL with a trailing slash, and confirms that we don't send a doubled slash (like "$url//info/refs") to the server. But this test makes no sense in t5541, which is about pushing. It should have been added in t5551. Let's move it there. But putting it at the end is tricky, since it checks the entire contents of the Apache access log. We could get around this by clearing the log before our test. But there's an even simpler solution: just make sure no doubled slashes appear in the log (fortunately, "http://" does not appear in the log itself). As a bonus, this also lets us drop the check for the v0 protocol (which is otherwise necessary since v2 makes multiple requests, and check_access_log insists on exactly matching the number of requests, even though we don't care about that here). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
6ec90b5 Jeff King 23 February 2023, 10:50:36 UTC t5541: stop marking "used receive-pack service" test as v0 only We have a test which checks to see if a request to git-receive-pack was made. Originally, it was checking the entire set of requests made in the script so far, including clones, and thus it would break when run with the v2 protocol (since that implies an extra request for fetches). Since the previous commit, though, we are only checking the requests made by a single push. And since there is no v2 push protocol, the test now passes no matter what's in GIT_TEST_PROTOCOL_VERSION. We can just run it all the time. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
77fb36a Jeff King 23 February 2023, 10:49:47 UTC t5541: run "used receive-pack service" test earlier There's a test in t5541 that confirms that "git push" makes two requests (a GET to /info/refs, and a POST to /git-receive-pack). However, it's a noop unless GIT_TEST_PROTOCOL_VERSION is set to "0", due to 8a1b0978ab (test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate, 2019-12-23). This means that almost nobody runs it. And indeed, it has been broken since b0c4adcdd7 (remote-curl: send Accept-Language header to server, 2022-07-11). But the fault is not in that commit, but in how brittle the test is. It runs after several operations have been performed, which means that it expects to see the complete set of requests made so far in the script. Commit b0c4adcdd7 added a new test, which means that the "used receive-pack service" test must be updated, too. Let's fix this by making the test less brittle. We'll move it higher in the script, right after the first push has completed. And we'll clear the access log right before doing the push, so we'll see only the requests from that command. This is technically testing less, in that we won't check that all of those other requests also correctly used smart http. But there's no particular reason think that if the first one did, the others wouldn't. After this patch, running: GIT_TEST_PROTOCOL_VERSION=0 ./t5541-http-push-smart.sh passes, whereas it did not before. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 February 2023, 21:01:14 UTC
d208bfd M Hickford 18 February 2023, 06:32:57 UTC credential: new attribute password_expiry_utc Some passwords have an expiry date known at generation. This may be years away for a personal access token or hours for an OAuth access token. When multiple credential helpers are configured, `credential fill` tries each helper in turn until it has a username and password, returning early. If Git authentication succeeds, `credential approve` stores the successful credential in all helpers. If authentication fails, `credential reject` erases matching credentials in all helpers. Helpers implement corresponding operations: get, store, erase. The credential protocol has no expiry attribute, so helpers cannot store expiry information. Even if a helper returned an improvised expiry attribute, git credential discards unrecognised attributes between operations and between helpers. This is a particular issue when a storage helper and a credential-generating helper are configured together: [credential] helper = storage # eg. cache or osxkeychain helper = generate # eg. oauth `credential approve` stores the generated credential in both helpers without expiry information. Later `credential fill` may return an expired credential from storage. There is no workaround, no matter how clever the second helper. The user sees authentication fail (a retry will succeed). Introduce a password expiry attribute. In `credential fill`, ignore expired passwords and continue to query subsequent helpers. In the example above, `credential fill` ignores the expired password and a fresh credential is generated. If authentication succeeds, `credential approve` replaces the expired password in storage. If authentication fails, the expired credential is erased by `credential reject`. It is unnecessary but harmless for storage helpers to self prune expired credentials. Add support for the new attribute to credential-cache. Eventually, I hope to see support in other popular storage helpers. Example usage in a credential-generating helper https://github.com/hickford/git-credential-oauth/pull/16 Signed-off-by: M Hickford <mirth.hickford@gmail.com> Reviewed-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 February 2023, 23:18:58 UTC
06dd2ba Junio C Hamano 22 February 2023, 22:55:59 UTC The seventeenth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 February 2023, 22:55:59 UTC
5048df6 Junio C Hamano 22 February 2023, 22:55:45 UTC Merge branch 'ab/hook-api-with-stdin' Extend the run-hooks API to allow feeding data from the standard input when running the hook script(s). * ab/hook-api-with-stdin: hook: support a --to-stdin=<path> option sequencer: use the new hook API for the simpler "post-rewrite" call hook API: support passing stdin to hooks, convert am's 'post-rewrite' run-command: allow stdin for run_processes_parallel run-command.c: remove dead assignment in while-loop 22 February 2023, 22:55:45 UTC
72972ea Junio C Hamano 22 February 2023, 22:55:45 UTC Merge branch 'ab/various-leak-fixes' Leak fixes. * ab/various-leak-fixes: push: free_refs() the "local_refs" in set_refspecs() push: refactor refspec_append_mapped() for subsequent leak-fix receive-pack: release the linked "struct command *" list grep API: plug memory leaks by freeing "header_list" grep.c: refactor free_grep_patterns() builtin/merge.c: free "&buf" on "Your local changes..." error builtin/merge.c: use fixed strings, not "strbuf", fix leak show-branch: free() allocated "head" before return commit-graph: fix a parse_options_concat() leak http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}() http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main() worktree: fix a trivial leak in prune_worktrees() repack: fix leaks on error with "goto cleanup" name-rev: don't xstrdup() an already dup'd string various: add missing clear_pathspec(), fix leaks clone: use free() instead of UNLEAK() commit-graph: use free_commit_graph() instead of UNLEAK() bundle.c: don't leak the "args" in the "struct child_process" tests: mark tests as passing with SANITIZE=leak 22 February 2023, 22:55:45 UTC
6aac634 Junio C Hamano 22 February 2023, 22:55:45 UTC Merge branch 'jk/doc-ls-remote-matching' Doc update. * jk/doc-ls-remote-matching: doc/ls-remote: clarify pattern format doc/ls-remote: cosmetic cleanups for examples 22 February 2023, 22:55:45 UTC
a42d69e Junio C Hamano 22 February 2023, 22:55:44 UTC Merge branch 'rs/cache-tree-strbuf-growth-fix' Remove unnecessary explicit sizing of strbuf. * rs/cache-tree-strbuf-growth-fix: cache-tree: fix strbuf growth in prime_cache_tree_rec() 22 February 2023, 22:55:44 UTC
24fb150 Junio C Hamano 22 February 2023, 22:55:44 UTC Merge branch 'ab/the-index-compatibility' Remove more remaining uses of macros that relies on the_index singleton instance without explicitly spelling it out. * ab/the-index-compatibility: cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS" cache-tree API: remove redundant update_main_cache_tree() cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*" cocci & cache.h: apply pending "index_cache_pos" rule cocci & cache.h: fully apply "active_nr" part of index-compatibility builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE" 22 February 2023, 22:55:44 UTC
5fc6d00 Junio C Hamano 22 February 2023, 22:55:44 UTC Merge branch 'en/name-rev-make-taggerdate-much-less-important' "git name-rev" heuristics update. * en/name-rev-make-taggerdate-much-less-important: name-rev: fix names by dropping taggerdate workaround 22 February 2023, 22:55:44 UTC
2b15969 Teng Long 20 February 2023, 14:24:44 UTC range-diff: let '--abbrev' option takes effect As mentioned in 'git-range-diff.txt': "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1])...", but '--abbrev' is not in the "regular" scope. In Git, the "abbrev" of an object may not be a fixed value in different repositories, depending on the needs of the them(Linus mentioned in e6c587c7 in 2016: "the Linux kernel project needs 11 to 12 hexdigits" at that time ), that's why a user may want to display abbrev according to a specified length. Although a similar effect can be achieved through configuration (like: git -c core.abbrev=<abbrev>), but based on ease of use (many users may not know that the -c option can be specified) and the description in existing document, supporting users to directly use '--abbrev', could be a good way. Signed-off-by: Teng Long <dyroneteng@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 22:02:05 UTC
c39952b Matthias Aßhauer 20 February 2023, 21:33:25 UTC fetch: choose a sensible default with --jobs=0 again prior to 51243f9 (run-command API: don't fall back on online_cpus(), 2022-10-12) `git fetch --multiple --jobs=0` would choose some default amount of jobs, similar to `git -c fetch.parallel=0 fetch --multiple`. While our documentation only ever promised that `fetch.parallel` would fall back to a "sensible default", it makes sense to do the same for `--jobs`. So fall back to online_cpus() and not BUG() out. This fixes https://github.com/git-for-windows/git/issues/4302 Reported-by: Drew Noakes <drnoakes@microsoft.com> Signed-off-by: Matthias Aßhauer <mha1993@live.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 20:09:40 UTC
17ab64e idriss fekir 19 February 2023, 00:25:27 UTC trace.c, git.c: remove unnecessary parameter to trace_repo_setup() trace_repo_setup() of trace.c is called with the argument 'prefix' from only one location, run_builtin of git.c, which sets 'prefix' to the return value of setup_git_directory() or setup_git_directory_gently() (a wrapper of the former). Now that "prefix" is in startup_info there is no need for the parameter of trace_repo_setup() because setup_git_directory() sets "startup_info->prefix" to the same value it returns. It would be less confusing to use "prefix" from startup_info instead of passing it as an argument. Signed-off-by: Idriss Fekir <mcsm224@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 20:06:32 UTC
d35d8f2 Ashutosh Pandey 18 February 2023, 19:21:28 UTC t2015-checkout-unborn.sh: changes the style for cd the `cd` followed the old style which wasn't consistent with the rest of the test suite, so this commit makes it consistent with the current style of the test suite for `cd` in subshell. Signed-off-by: Ashutosh Pandey <ashutosh.pandeyhlr007@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 20:01:53 UTC
a4cf900 John Cai 20 February 2023, 21:04:42 UTC diff: teach diff to read algorithm from diff driver It can be useful to specify diff algorithms per file type. For example, one may want to use the minimal diff algorithm for .json files, another for .c files, etc. The diff machinery already checks attributes for a diff driver. Teach the diff driver parser a new type "algorithm" to look for in the config, which will be used if a driver has been specified through the attributes. Enforce precedence of the diff algorithm by favoring the command line option, then looking at the driver attributes & config combination, then finally the diff.algorithm config. To enforce precedence order, use a new `ignore_driver_algorithm` member during options parsing to indicate the diff algorithm was set via command line args. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 17:29:10 UTC
11e95e1 John Cai 20 February 2023, 21:04:41 UTC diff: consolidate diff algorithm option parsing A subsequent commit will need the ability to tell if the diff algorithm was set through the command line through setting a new member of diff_options. While this logic can be added to the diff_opt_diff_algorithm() callback, the `--minimal` and `--histogram` options are handled via OPT_BIT without a callback. Remedy this by consolidating the options parsing logic for --minimal and --histogram into one callback. This way we can modify `diff_options` in that function. As an additional refactor, the logic that sets the diff algorithm in diff_opt_diff_algorithm() can be refactored into a helper that will allow multiple callsites to set the diff algorithm. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 17:29:08 UTC
16b3880 Phillip Wood 20 February 2023, 14:19:34 UTC rebase -i: check labels and refs when parsing todo list Check that the argument to the "label" and "update-ref" commands is a valid refname when the todo list is parsed rather than waiting until the command is executed. This means that the user can deal with any errors at the beginning of the rebase rather than having it stop halfway through due to a typo in a label name. The "update-ref" command is changed to reject single level refs as it is all to easy to type "update-ref branch" which is incorrect rather than "update-ref refs/heads/branch" Note that it is not straight forward to check the arguments to "reset" and "merge" commands as they may be any revision, not just a refname and we do not have an equivalent of check_refname_format() for revisions. Helped-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Acked-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 17:18:37 UTC
6eb095d Patrick Steinhardt 16 February 2023, 10:29:48 UTC delta-islands: fix segfault when freeing island marks In 647982bb71 (delta-islands: free island_marks and bitmaps, 2023-02-03) we have introduced logic to free `island_marks` in order to reduce heap memory usage in git-pack-objects(1). This commit is causing segfaults in the case where this Git command does not load delta islands at all, e.g. when reading object IDs from standard input. One such crash can be hit when using repacking multi-pack-indices with delta islands enabled. The root cause of this bug is that we unconditionally dereference the `island_marks` variable even in the case where it is a `NULL` pointer, which is fixed by making it conditional. Note that we still leave the logic in place to set the pointer to `-1` to detect use-after-free bugs even when there are no loaded island marks at all. Signed-off-by: Patrick Steinhardt <ps@pks.im> Acked-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 February 2023, 17:15:04 UTC
fd2da4b René Scharfe 18 February 2023, 08:36:23 UTC archive: add --mtime Allow users to specify the modification time of archive entries. The new option --mtime uses approxidate() to parse a time specification and overrides the default of using the current time for trees and the commit time for tags and commits. It can be used to create a reproducible archive for a tree, or to use a specific mtime without creating a commit with GIT_COMMITTER_DATE set. This implementation doesn't support the negated form of the new option, i.e. --no-mtime is not accepted. It is not possible to have no mtime at all. We could use the Unix epoch or revert to the default behavior, but since negation is not necessary for the intended use it's left undecided for now. Requested-by: Raul E Rangel <rrangel@chromium.org> Suggested-by: demerphq <demerphq@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 February 2023, 17:29:13 UTC
50bebf9 Junio C Hamano 17 February 2023, 23:33:37 UTC format.attach: allow empty value to disable multi-part messages When a lower precedence configuration file (e.g. /etc/gitconfig) defines format.attach in any way, there was no way to disable it in a more specific configuration file (e.g. $HOME/.gitconfig). Change the behaviour of setting it to an empty string. It used to mean that the result is still a multipart message with only dashes used as a multi-part separator, but now it resets the setting to the default (which would be to give an inline patch, unless other command line options are in effect). Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 February 2023, 23:43:09 UTC
3b0ebb7 Jeff King 17 February 2023, 00:40:29 UTC t0066: drop setup of "dir5" The symlink setup in t0066 makes several directories with links, dir4 through dir6. But ever since dir5 was introduced in fa1da7d2ee (dir-iterator: add flags parameter to dir_iterator_begin, 2019-07-10), it has never actually been used. It was left over from an earlier iteration of the patch which tried to handle recursive symlinks specially, as seen in: https://lore.kernel.org/git/20190502144829.4394-7-matheus.bernardino@usp.br/ It's not hurting any of the existing tests to be there, but the extra setup is confusing to anybody trying to read and understand the tests. Let's drop the extra directory, and we'll rename "dir6" to "dir5" so nobody wonders whether the gap in naming is important. Helped-by: Matheus Tavares Bernardino <matheus.tavb@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 February 2023, 01:55:42 UTC
29ae2c9 Jeff King 16 February 2023, 20:56:32 UTC add basic http proxy tests We do not test our http proxy functionality at all in the test suite, so this is a pretty big blind spot. Let's at least add a basic check that we can go through an authenticating proxy to perform a clone. A few notes on the implementation: - I'm using a single apache instance to proxy to itself. This seems to work fine in practice, and we can check with a test that this rather unusual setup is doing what we expect. - I've put the proxy tests into their own script, and it's the only one which loads the apache proxy config. If any platform can't handle this (e.g., doesn't have the right modules), the start_httpd step should fail and gracefully skip the rest of the script (but all the other http tests in existing scripts will continue to run). - I used a separate passwd file to make sure we don't ever get confused between proxy and regular auth credentials. It's using the antiquated crypt() format. This is a terrible choice security-wise in the modern age, but it's what our existing passwd file uses, and should be portable. It would probably be reasonable to switch both of these to bcrypt, but we can do that in a separate patch. - On the client side, we test two situations with credentials: when they are present in the url, and when the username is present but we prompt for the password. I think we should be able to handle the case that _neither_ is present, but an HTTP 407 causes us to prompt for them. However, this doesn't seem to work. That's either a bug, or at the very least an opportunity for a feature, but I punted on it for now. The point of this patch is just getting basic coverage, and we can explore possible deficiencies later. - this doesn't work with LIB_HTTPD_SSL. This probably would be valuable to have, as https over an http proxy is totally different (it uses CONNECT to tunnel the session). But adding in mod_proxy_connect and some basic config didn't seem to work for me, so I punted for now. Much of the rest of the test suite does not currently work with LIB_HTTPD_SSL either, so we shouldn't be making anything much worse here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 February 2023, 00:24:23 UTC
e00e56a Taylor Blau 16 February 2023, 18:27:14 UTC dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` The `FOLLOW_SYMLINKS` flag was added to the dir-iterator API in fa1da7d2ee (dir-iterator: add flags parameter to dir_iterator_begin, 2019-07-10) in order to follow symbolic links while traversing through a directory. `FOLLOW_SYMLINKS` gained its first caller in ff7ccc8c9a (clone: use dir-iterator to avoid explicit dir traversal, 2019-07-10), but it was subsequently removed in 6f054f9fb3 (builtin/clone.c: disallow `--local` clones with symlinks, 2022-07-28). Since then, we've held on to the code for `DIR_ITERATOR_FOLLOW_SYMLINKS` in the name of making minimally invasive changes during a security embargo. In fact, we even changed the dir-iterator API in bffc762f87 (dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS, 2023-01-24) without having any non-test callers of that flag. Now that we're past those security embargo(s), let's finalize our cleanup of the `DIR_ITERATOR_FOLLOW_SYMLINKS` code and remove its implementation since there are no remaining callers. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 February 2023, 00:21:56 UTC
58eab6f Junio C Hamano 16 February 2023, 02:56:14 UTC test-genzeros: avoid raw write(2) This test helper feeds 256kB of data at once to a single invocation of the write(2) system call, which may be too much for some platforms. Call our xwrite() wrapper that knows to honor MAX_IO_SIZE limit and cope with short writes due to EINTR instead, and die a bit more loudly by calling die_errno() when xwrite() indicates an error. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 February 2023, 16:30:38 UTC
9deef08 Junio C Hamano 16 February 2023, 00:42:25 UTC rev-list: clarify git-log default date format The documentation mistakenly said that the default format was similar to RFC 2822 format and tried to specify it by enumerating differences, which had two problems: * There are some more differences from the 2822 format that are not mentioned; worse yet * The default format is not modeled after RFC 2822 format at all. As can be seen in f80cd783 (date.c: add "show_date()" function., 2005-05-06), it is a derivative of ctime(3) format. Stop saying that it is similar to RFC 2822, and rewrite the description to explain the format without requiring the reader to know any other format. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 February 2023, 01:34:46 UTC
d9d677b Junio C Hamano 16 February 2023, 00:08:41 UTC The sixteenth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 February 2023, 01:11:54 UTC
59397e9 Junio C Hamano 16 February 2023, 01:11:54 UTC Merge branch 'cw/doc-pushurl-vs-url' Doc update. * cw/doc-pushurl-vs-url: Documentation: clarify multiple pushurls vs urls 16 February 2023, 01:11:54 UTC
eb11ec2 Junio C Hamano 16 February 2023, 01:11:54 UTC Merge branch 'ab/config-h-remove-unused' Code clean-up. * ab/config-h-remove-unused: config.h: remove unused git_configset_add_parameters() 16 February 2023, 01:11:54 UTC
06bca97 Junio C Hamano 16 February 2023, 01:11:53 UTC Merge branch 'ab/retire-scripted-add-p' Finally retire the scripted "git add -p/-i" implementation and have everybody use the one reimplemented in C. * ab/retire-scripted-add-p: docs & comments: replace mentions of "git-add--interactive.perl" add API: remove run_add_interactive() wrapper function add: remove "add.interactive.useBuiltin" & Perl "git add--interactive" 16 February 2023, 01:11:53 UTC
c5f7b2a Junio C Hamano 16 February 2023, 01:11:53 UTC Merge branch 'rs/size-t-fixes' Type fixes. * rs/size-t-fixes: pack-objects: use strcspn(3) in name_cmp_len() read-cache: use size_t for {base,df}_name_compare() 16 February 2023, 01:11:53 UTC
063ec7b Junio C Hamano 16 February 2023, 01:11:53 UTC Merge branch 'kf/t5000-modernise' Test clean-up. * kf/t5000-modernise: t5000: modernise archive and :(glob) test 16 February 2023, 01:11:53 UTC
back to top