| 3dcec76 | Junio C Hamano | 02 October 2022, 15:43:56 UTC | Git 2.38 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 October 2022, 15:43:56 UTC |
| c03bee6 | Junio C Hamano | 02 October 2022, 15:24:32 UTC | Merge tag 'l10n-2.38.0-rnd3' of https://github.com/git-l10n/git-po l10n-2.38.0-rnd3 * tag 'l10n-2.38.0-rnd3' of https://github.com/git-l10n/git-po: (25 commits) l10n: zh_TW.po: Git 2.38.0, round 3 l10n: fr: v2.38.0 round 3 l10n: Update Catalan translation l10n: de.po: update German translation l10n: zh_CN: 2.38.0 round 3 l10n: tr: v2.38.0 3rd round l10n: bg.po: Updated Bulgarian translation (5484t) l10n: po-id for 2.38 (round 3) l10n: es: update translation l10n: sv.po: Update Swedish translation (5484t0f0u) l10n: Update Catalan translation l10n: fr: don't say that merge is "the default strategy" l10n: zh_CN v2.38.0 rounds 1 & 2 l10n: po-id for 2.38 (round 2) l10n: tr: v2.38.0 round 2 l10n: bg.po: Updated Bulgarian translation (5484t) l10n: fr: v2.38.0 round 2 l10n: fr: v2.38 round 1 l10n: fr: The word 'branche' is only feminine l10n: Update Catalan translation ... | 02 October 2022, 15:24:32 UTC |
| dedb288 | Yi-Jyun Pan | 01 October 2022, 11:04:42 UTC | l10n: zh_TW.po: Git 2.38.0, round 3 Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 01 October 2022, 11:10:41 UTC |
| d7f69b7 | Jiang Xin | 01 October 2022, 02:02:03 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.38 (round 3) | 01 October 2022, 02:02:03 UTC |
| 21cefac | Jiang Xin | 29 September 2022, 10:54:12 UTC | Merge branch 'l10n-de-2.38-rnd3' of github.com:ralfth/git * 'l10n-de-2.38-rnd3' of github.com:ralfth/git: l10n: de.po: update German translation | 29 September 2022, 10:54:12 UTC |
| 48bf511 | Jiang Xin | 29 September 2022, 00:00:30 UTC | Merge branch 'fr_2.38_rnd3' of github.com:jnavila/git * 'fr_2.38_rnd3' of github.com:jnavila/git: l10n: fr: v2.38.0 round 3 | 29 September 2022, 00:00:30 UTC |
| 08f41b8 | Jiang Xin | 28 September 2022, 23:59:44 UTC | Merge branch 'catalan' of github.com:Softcatala/git-po * 'catalan' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 28 September 2022, 23:59:44 UTC |
| 48fe8e6 | Jean-Noël Avila | 28 September 2022, 19:46:22 UTC | l10n: fr: v2.38.0 round 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 28 September 2022, 19:46:22 UTC |
| 42fe2b9 | Jordi Mas | 28 September 2022, 17:05:55 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 28 September 2022, 17:05:55 UTC |
| 92e51fe | Ralf Thielow | 28 September 2022, 15:15:53 UTC | l10n: de.po: update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 28 September 2022, 15:15:53 UTC |
| b796ca1 | Fangyi Zhou | 28 September 2022, 14:50:49 UTC | l10n: zh_CN: 2.38.0 round 3 Signed-off-by: Fangyi Zhou <me@fangyi.io> | 28 September 2022, 14:51:07 UTC |
| 37db941 | Jiang Xin | 28 September 2022, 12:54:29 UTC | Merge branch 'turkish' of github.com:bitigchi/git-po * 'turkish' of github.com:bitigchi/git-po: l10n: tr: v2.38.0 3rd round | 28 September 2022, 12:54:29 UTC |
| 8d50061 | Jiang Xin | 28 September 2022, 12:52:34 UTC | Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5484t) | 28 September 2022, 12:52:34 UTC |
| 2c30dfa | Emir SARI | 28 September 2022, 09:32:13 UTC | l10n: tr: v2.38.0 3rd round Signed-off-by: Emir SARI <emir_sari@icloud.com> | 28 September 2022, 09:32:13 UTC |
| 88fda53 | Alexander Shopov | 28 September 2022, 09:00:59 UTC | l10n: bg.po: Updated Bulgarian translation (5484t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 28 September 2022, 09:07:07 UTC |
| 55b1c1a | Bagas Sanjaya | 25 September 2022, 07:53:53 UTC | l10n: po-id for 2.38 (round 3) Update following components: * sequencer.c * wt-status.c Translate following new components: * compat/compiler.h * compat/disk.h * compat/fsmonitor/fsm-health-win32.c * compat/fsmonitor/fsm-listen-darwin.c * compat/fsmonitor/fsm-listen-win32.c * compat/fsmonitor/fsm-settings-win32.c * compat/mingw.c * compat/obstack.c * compat/regex/regcomp.c * compat/simple-ipc/ipc-unix-socket.c * compat/simple-ipc/ipc-win32.c * compat/terminal.c * convert.c * entry.c * environment.c * exec-cmd.c * git-merge-octopus.sh * git-sh-setup.sh * list-objects-filter-options.c * list-objects-filter-options.h * list-objects.c * lockfile.c * ls-refs.c * mailinfo.c * name-hash.c * notes-merge.c * notes-utils.c * pkt-line.c * preload-index.c * pretty.c * promisor-remote.c * protocol-caps.c * read-cache.c * scalar.c * transport-helper.c * transport.c * tree-walk.c * urlmatch.c * walker.c * wrapper.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 28 September 2022, 08:06:14 UTC |
| 9af6cb8 | Alex Henrie | 28 September 2022, 04:56:55 UTC | l10n: es: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 28 September 2022, 04:56:55 UTC |
| 4ff58e9 | Jiang Xin | 28 September 2022, 00:03:38 UTC | Merge branch 'main' of github.com:git/git * 'main' of github.com:git/git: Git 2.38-rc2 pack-bitmap: remove trace2 region from hot path | 28 September 2022, 00:03:38 UTC |
| bcd6bc4 | Junio C Hamano | 27 September 2022, 18:25:52 UTC | Git 2.38-rc2 We have small updates since -rc1 but none of them is about a new thing and there is no updates to the release notes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2022, 18:25:52 UTC |
| 2a7d63a | Junio C Hamano | 27 September 2022, 04:46:51 UTC | Merge branch 'ds/bitmap-lookup-remove-tracing' Perf-fix. * ds/bitmap-lookup-remove-tracing: pack-bitmap: remove trace2 region from hot path | 27 September 2022, 04:46:51 UTC |
| 89a1ab8 | Derrick Stolee | 26 September 2022, 13:17:57 UTC | pack-bitmap: remove trace2 region from hot path The trace2 region around the call to lazy_bitmap_for_commit() in bitmap_for_commit() was added in 28cd730680d (pack-bitmap: prepare to read lookup table extension, 2022-08-14). While adding trace2 regions is typically helpful for tracking performance, this method is called possibly thousands of times as a commit walk explores commit history looking for a matching bitmap. When trace2 output is enabled, this region is emitted many times and performance is throttled by that output. For now, remove these regions entirely. This is a critical path, and it would be valuable to measure that the time spent in bitmap_for_commit() does not increase when using the commit lookup table. The best way to do that would be to use a mechanism that sums the time spent in a region and reports a single value at the end of the process. This technique was introduced but not merged by [1] so maybe this example presents some justification to revisit that approach. [1] https://lore.kernel.org/git/pull.1099.v2.git.1640720202.gitgitgadget@gmail.com/ To help with the 'git blame' output in this region, add a comment that warns against adding a trace2 region. Delete a test from t5310 that used that trace output to check that this lookup optimization was activated. To create this kind of test again in the future, the stopwatch traces mentioned earlier could be used as a signal that we activated this code path. Helpedy-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 September 2022, 19:09:18 UTC |
| 33ccfd1 | Peter Krefting | 26 September 2022, 05:36:23 UTC | l10n: sv.po: Update Swedish translation (5484t0f0u) Also fix a couple of typos. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 26 September 2022, 05:36:23 UTC |
| 6c9165c | Jordi Mas | 25 September 2022, 19:04:22 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 25 September 2022, 19:04:22 UTC |
| 54e1f9f | Jiang Xin | 24 September 2022, 13:51:06 UTC | Merge branch 'main' of github.com:git/git * 'main' of github.com:git/git: cmd-list.perl: fix identifying man sections pack-bitmap: improve grammar of "xor chain" error message | 24 September 2022, 13:51:06 UTC |
| 456a75f | Jiang Xin | 24 September 2022, 13:12:37 UTC | Merge branch 'fr_quickfix' of github.com:jnavila/git * 'fr_quickfix' of github.com:jnavila/git: l10n: fr: don't say that merge is "the default strategy" | 24 September 2022, 13:12:37 UTC |
| 9865dce | Jiang Xin | 24 September 2022, 13:09:22 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.38 (round 2) | 24 September 2022, 13:09:22 UTC |
| 1d8177c | Jiang Xin | 24 September 2022, 13:08:11 UTC | Merge branch 'turkish' of github.com:bitigchi/git-po * 'turkish' of github.com:bitigchi/git-po: l10n: tr: v2.38.0 round 2 | 24 September 2022, 13:08:11 UTC |
| d1e76d5 | Alex Henrie | 27 June 2022, 04:17:24 UTC | l10n: fr: don't say that merge is "the default strategy" The text of this message was changed in commit 71076d0edde43a7672a9a0f555753ff078602a64 to avoid making any suggestion about which strategy is better for the situation at hand. Update the Franch translation to match. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 23 September 2022, 18:42:58 UTC |
| 4fd6c5e | Junio C Hamano | 23 September 2022, 18:07:49 UTC | Merge branch 'ac/bitmap-lookup-table' Grammofix. * ac/bitmap-lookup-table: pack-bitmap: improve grammar of "xor chain" error message | 23 September 2022, 18:07:49 UTC |
| 0d14f80 | Junio C Hamano | 23 September 2022, 18:07:48 UTC | Merge branch 'ma/scalar-to-main-fix' Fix manpage generation. * ma/scalar-to-main-fix: cmd-list.perl: fix identifying man sections | 23 September 2022, 18:07:48 UTC |
| 32c6fff | Martin Ågren | 23 September 2022, 08:07:33 UTC | cmd-list.perl: fix identifying man sections We attribute each documentation text file to a man section by finding a line in the file that looks like "gitfoo(<digit>)". Commit cc75e556a9 ("scalar: add to 'git help -a' command list", 2022-09-02) updated this logic to look not only for "gitfoo" but also "scalarfoo". In doing so, it forgot to account for the fact that after the updated regex has found a match, the man section is no longer to be found in `$1` but now lives in `$2`. This makes our git(1) manpage look as follows: Main porcelain commands git-add(git) Add file contents to the index. [...] gitk(git) The Git repository browser. scalar(scalar) A tool for managing large Git repositories. Restore the man sections by not capturing the (git|scalar) part of the match into `$1`. As noted by Ævar [1], we could even match any "foo" rather than just "gitfoo" and "scalarfoo", but that's a larger change. For now, just fix the regression in cc75e556a9. [1] https://lore.kernel.org/git/220923.86wn9u4joo.gmgdl@evledraar.gmail.com/#t Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2022, 17:01:07 UTC |
| 711340c | Alex Henrie | 22 September 2022, 02:51:58 UTC | pack-bitmap: improve grammar of "xor chain" error message Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2022, 15:54:05 UTC |
| d5be499 | Fangyi Zhou | 16 September 2022, 10:31:26 UTC | l10n: zh_CN v2.38.0 rounds 1 & 2 Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Li Linchao <lilinchao@oschina.cn> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io> | 23 September 2022, 13:53:24 UTC |
| d4df860 | Bagas Sanjaya | 22 September 2022, 07:54:56 UTC | l10n: po-id for 2.38 (round 2) Update following components: * branch.c * builtin/log.c * builtin/rebase.c * builtin/remote.c * builtin/reset.c * builtin/rev-list.c * builtin/rev-parse.c * builtin/revert.c * builtin/sparse-checkout.c * builtin/submodule--helper.c * command-list.h * help.c * merge.c Translate following new components: * builtin/check-attr.c * builtin/check-ignore.c * builtin/check-mailmap.c * builtin/column.c * builtin/credential-cache--daemon.c * builtin/credential-cache.c * builtin/credential-store.c * builtin/diagnose.c * builtin/env--helper.c * builtin/fsmonitor--daemon.c * builtin/interpret-trailers.c * builtin/mailinfo.c * builtin/mailsplit.c * builtin/mktag.c * builtin/mktree.c * builtin/pack-redundant.c * builtin/replace.c * builtin/rerere.c * builtin/stripspace.c * bulk-checkin.c * commit.c * credential.c * fsmonitor-ipc.c * fsmonitor-settings.c * http-fetch.c * http.c Also remove unused strings. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 23 September 2022, 13:02:42 UTC |
| 20f5a4f | Emir SARI | 22 September 2022, 13:40:33 UTC | l10n: tr: v2.38.0 round 2 Signed-off-by: Emir SARI <emir_sari@icloud.com> | 23 September 2022, 10:10:04 UTC |
| 471ae3e | Alexander Shopov | 23 September 2022, 09:18:57 UTC | l10n: bg.po: Updated Bulgarian translation (5484t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 23 September 2022, 09:21:03 UTC |
| f2d1418 | Jiang Xin | 23 September 2022, 09:06:12 UTC | Merge branch 'fr_v2.38_rnd2' of github.com:jnavila/git * 'fr_v2.38_rnd2' of github.com:jnavila/git: l10n: fr: v2.38.0 round 2 l10n: fr: v2.38 round 1 l10n: fr: The word 'branche' is only feminine | 23 September 2022, 09:06:12 UTC |
| f5e09d5 | Jiang Xin | 23 September 2022, 08:58:14 UTC | Merge branch 'catalan' of github.com:Softcatala/git-po * 'catalan' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 23 September 2022, 08:58:14 UTC |
| e3be58c | Jiang Xin | 23 September 2022, 08:51:23 UTC | Merge branch 'l10n-de-2.38' of github.com:ralfth/git * 'l10n-de-2.38' of github.com:ralfth/git: l10n: de.po: update German translation | 23 September 2022, 08:51:23 UTC |
| eb0d781 | Jiang Xin | 23 September 2022, 08:50:32 UTC | Merge branch 'main' of github.com:git/git * 'main' of github.com:git/git: list-objects-filter: initialize sub-filter structs Git 2.38-rc1 Final batch before -rc1 builtin/diagnose.c: don't translate the two mode values t/Makefile: remove 'test-results' on 'make clean' gc: don't translate literal commands Documentation: clean up various typos in technical docs Documentation: clean up a few misspelled word typos version: fix builtin linking & documentation diagnose: add to command-list.txt Documentation: add ReviewingGuidelines commit-graph: Fix missing closedir in expire_commit_graphs diagnose.c: refactor to safely use 'd_type' help: fix doubled words in explanation for developer interfaces api docs: link to html version of api-trace2 docs: fix a few recently broken links reftable: use a pointer for pq_entry param | 23 September 2022, 08:50:32 UTC |
| 4b79ee4 | Junio C Hamano | 22 September 2022, 22:30:47 UTC | Merge branch 'jk/list-objects-filter-cleanup' Fix uninitialized memory access in a recent fix-up that is already in -rc1. * jk/list-objects-filter-cleanup: list-objects-filter: initialize sub-filter structs | 22 September 2022, 22:30:47 UTC |
| d5e8131 | Jean-Noël Avila | 22 September 2022, 19:42:36 UTC | l10n: fr: v2.38.0 round 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 22 September 2022, 19:52:26 UTC |
| 77532d0 | Jean-Noël Avila | 17 September 2022, 14:26:16 UTC | l10n: fr: v2.38 round 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 22 September 2022, 19:52:26 UTC |
| 97db13f | Hubert Bossot | 20 June 2021, 19:40:43 UTC | l10n: fr: The word 'branche' is only feminine Signed-off-by: hbossot <hbossot@profideo.com> | 22 September 2022, 19:52:04 UTC |
| 4eaed7c | Jeff King | 22 September 2022, 09:35:33 UTC | list-objects-filter: initialize sub-filter structs Since commit c54980ab83 (list-objects-filter: convert filter_spec to a strbuf, 2022-09-11), building with SANITIZE=undefined triggers an error in t5616. The problem is that we end up with a strbuf that has been zero-initialized instead of via STRBUF_INIT. Feeding that strbuf to strbuf_addbuf() in list_objects_filter_copy() means we will call memcpy like: memcpy(some_actual_buffer, NULL, 0); This works on most systems because we're copying zero bytes, but it is technically undefined behavior to ever pass NULL to memcpy. Even though c54980ab83 is where the bug manifests, that is only because we switched away from a string_list, which is OK with being zero-initialized (though it may cause other problems by not duplicating the strings, it happened to be OK in this instance). The actual bug is caused by the commit before that, 2a01bdedf8 (list-objects-filter: add and use initializers, 2022-09-11). There we consistently initialize the top-level filter structs, but we forgot the dynamically allocated ones we stick in filter_options->sub when creating combined filters. Note that we need to fix two spots here: where we parse a "combine:" filter, but also where we transform from a single-filter into a combined one after seeing multiple "--filter" options. In the second spot, we'll do some minor refactoring to avoid repeating our very-long array index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2022, 19:43:04 UTC |
| aa923f7 | Jordi Mas | 22 September 2022, 16:30:42 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 22 September 2022, 16:30:42 UTC |
| 9e17cd5 | Ralf Thielow | 22 September 2022, 15:23:13 UTC | l10n: de.po: update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> | 22 September 2022, 15:23:13 UTC |
| 1b3d6e1 | Junio C Hamano | 21 September 2022, 22:26:39 UTC | Git 2.38-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 22:27:03 UTC |
| 04cc66f | Junio C Hamano | 21 September 2022, 22:27:03 UTC | Merge branch 'sg/parse-options-subcommand' Fix messages incorrectly marked for translation. * sg/parse-options-subcommand: gc: don't translate literal commands | 21 September 2022, 22:27:03 UTC |
| 4140830 | Junio C Hamano | 21 September 2022, 22:27:02 UTC | Merge branch 'js/typofix' * js/typofix: Documentation: clean up various typos in technical docs Documentation: clean up a few misspelled word typos | 21 September 2022, 22:27:02 UTC |
| 17df9d3 | Junio C Hamano | 21 September 2022, 22:27:02 UTC | Merge branch 'sg/clean-test-results' "make clean" stopped cleaning the test results directory as a side effect of a topic that has nothing to do with "make clean", which has been corrected. * sg/clean-test-results: t/Makefile: remove 'test-results' on 'make clean' | 21 September 2022, 22:27:02 UTC |
| 2cf2ae9 | Junio C Hamano | 21 September 2022, 22:27:02 UTC | Merge branch 'vd/check-docs-fixes' Build fix. * vd/check-docs-fixes: version: fix builtin linking & documentation diagnose: add to command-list.txt | 21 September 2022, 22:27:02 UTC |
| ac45db1 | Junio C Hamano | 21 September 2022, 22:27:02 UTC | Merge branch 'vd/doc-reviewing-guidelines' Just like we have coding guidelines, we now have guidelines for reviewers. * vd/doc-reviewing-guidelines: Documentation: add ReviewingGuidelines | 21 September 2022, 22:27:02 UTC |
| 86c108a | Junio C Hamano | 21 September 2022, 22:27:01 UTC | Merge branch 'vd/scalar-generalize-diagnose' Portability fix. * vd/scalar-generalize-diagnose: builtin/diagnose.c: don't translate the two mode values diagnose.c: refactor to safely use 'd_type' | 21 September 2022, 22:27:01 UTC |
| 370d3a0 | Junio C Hamano | 21 September 2022, 20:50:47 UTC | Final batch before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 21:23:14 UTC |
| dd37e56 | Junio C Hamano | 21 September 2022, 21:23:14 UTC | Merge branch 'fz/help-doublofix' Typofix for topic already in -rc0. * fz/help-doublofix: help: fix doubled words in explanation for developer interfaces | 21 September 2022, 21:23:14 UTC |
| 8c88f75 | Junio C Hamano | 21 September 2022, 21:23:14 UTC | Merge branch 'tz/tech-docs-to-help-fix' Docfix for topic already in -rc0. * tz/tech-docs-to-help-fix: api docs: link to html version of api-trace2 docs: fix a few recently broken links | 21 September 2022, 21:23:14 UTC |
| 3239100 | Junio C Hamano | 21 September 2022, 21:23:14 UTC | Merge branch 'ml/commit-graph-expire-dir-leak-fix' A result from opendir() was leaking in the commit-graph expiration codepath, which has been plugged. * ml/commit-graph-expire-dir-leak-fix: commit-graph: Fix missing closedir in expire_commit_graphs | 21 September 2022, 21:23:14 UTC |
| f73ad8f | Junio C Hamano | 21 September 2022, 21:23:13 UTC | Merge branch 'ec/reftable-pass-pq-entry-by-reference' Small code clean-up in reftable implementation. * ec/reftable-pass-pq-entry-by-reference: reftable: use a pointer for pq_entry param | 21 September 2022, 21:23:13 UTC |
| d956fa8 | Alex Henrie | 20 September 2022, 05:06:32 UTC | builtin/diagnose.c: don't translate the two mode values These strings are not translatable in the diagnose_options array in diagnose.c. Don't translate them in builtin/diagnose.c either. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 18:53:35 UTC |
| d11b875 | SZEDER Gábor | 20 September 2022, 20:16:19 UTC | t/Makefile: remove 'test-results' on 'make clean' The 't/test-results' directory and its contents are by-products of the test process, so 'make clean' should remove them, but, alas, this has been broken since fee65b194d (t/Makefile: don't remove test-results in "clean-except-prove-cache", 2022-07-28). The 'clean' target in 't/Makefile' was not directly responsible for removing the 'test-results' directory, but relied on its dependency 'clean-except-prove-cache' to do that [1]. ee65b194d broke this, because it only removed the 'rm -r test-results' command from the 'clean-except-prove-cache' target instead of moving it to the 'clean' target, resulting in stray 't/test-results' directories. Add that missing cleanup command to 't/Makefile', and to all sub-Makefiles touched by that commit as well. [1] 60f26f6348 (t/Makefile: retain cache t/.prove across prove runs, 2012-05-02) Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 18:32:13 UTC |
| 8b74492 | Alex Henrie | 20 September 2022, 05:07:25 UTC | gc: don't translate literal commands The command you type is still "git maintenance" even in other languages. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 17:43:10 UTC |
| bbb0c35 | Jacob Stopak | 20 September 2022, 02:45:57 UTC | Documentation: clean up various typos in technical docs Used GNU "aspell check <filename>" to review various technical documentation files with the default aspell dictionary. Ignored false-positives between american and british english. Signed-off-by: Jacob Stopak <jacob@initialcommit.io> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 17:28:36 UTC |
| 72991ff | Jacob Stopak | 20 September 2022, 02:45:56 UTC | Documentation: clean up a few misspelled word typos Used GNU "aspell check <filename>" to review various documentation files with the default aspell dictionary. Ignored false-positives between american and british english. Signed-off-by: Jacob Stopak <jacob@initialcommit.io> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2022, 17:28:35 UTC |
| 82958c3 | Jiang Xin | 21 September 2022, 00:14:37 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.38 (round 1) | 21 September 2022, 00:14:37 UTC |
| 2e2f4dd | Jiang Xin | 21 September 2022, 00:13:27 UTC | Merge branch 'main' of github.com:git/git * 'main' of github.com:git/git: (45 commits) A bit more of remaining topics before -rc1 t1800: correct test to handle Cygwin chainlint: colorize problem annotations and test delimiters ls-files: fix black space in error message list-objects-filter: convert filter_spec to a strbuf list-objects-filter: add and use initializers list-objects-filter: handle null default filter spec list-objects-filter: don't memset after releasing filter struct builtin/mv.c: fix possible segfault in add_slash() Documentation/technical: include Scalar technical doc t/perf: add 'GIT_PERF_USE_SCALAR' run option t/perf: add Scalar performance tests scalar-clone: add test coverage scalar: add to 'git help -a' command list scalar: implement the `help` subcommand git help: special-case `scalar` scalar: include in standard Git build & installation scalar: fix command documentation section header t: retire unused chainlint.sed t/Makefile: teach `make test` and `make prove` to run chainlint.pl ... | 21 September 2022, 00:13:27 UTC |
| 03f47f2 | Bagas Sanjaya | 17 September 2022, 03:39:24 UTC | l10n: po-id for 2.38 (round 1) Update following components: * add-patch.c * advice.c * builtin/add.c * builtin/am.c * builtin/clone.c * builtin/gc.c * builtin/help.c * builtin/ls-files.c * builtin/merge.c * diff.c * merge-ort.c * merge-tree.c * object-file.c * pack-bitmap.c * remote.c * revision.c * setup.c Translate following new components: * builtin/bugreport.c * builtin/checkout--worker.c * builtin/checkout-index.c * builtin/commit-graph.c * builtin/fmt-merge-msg.c * builtin/for-each-ref.c * builtin/merge-file.c * builtin/merge-recursive.c * builtin/range-diff.c * bundle-uri.c * chunk-format.c * color.c * command-list.h * commit-graph.c * delta-islands.c * diagnose.c * diff-lib.c * diff-no-index.c * diffcore-order.c * diffcore-rename.c * diffcore-rotate.c * dir.c * editor.c * for-each-repo.c * parse-options-cb.c * parse-options.c * parse-options.h * path.c * pathspec.c * prune-packed.c * range-diff.c * ref-filter.c * ref-filter.h * remote-curl.c * replace-object.c * rerere.h * run-command.c * unpack-trees.c * usage.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 20 September 2022, 09:48:53 UTC |
| 9b1dc1c | Victoria Dye | 20 September 2022, 00:19:55 UTC | version: fix builtin linking & documentation Like most builtins, 'version' is documented in a corresponding 'Documentation/git-version.txt' and can be invoked with 'git version'. However, the 'check-docs' Makefile target showed that it was "removed but documented: git-version." This was cause by the fact that it is not built as a standalone 'git-version' executable, therefore appearing "removed" to 'check-docs'. Without a precedent for documented builtins that aren't built into an executable *or* any clear reason why a standalone 'git-version' shouldn't exist, the 'check-docs' error appears to correctly identify an issue. To correct that mismatch, add 'git-version' to the 'BUILT_INS' list in the root Makefile (indicating that the 'cmd_version()' function appears in a file that is *not* 'builtin/version.c'). Additionally, to avoid the "no link" message in 'check-docs', list 'git-version' as an "ancilliaryinterrogator" (like 'git help') in 'command-list.txt'. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2022, 00:28:25 UTC |
| 89c8048 | Victoria Dye | 20 September 2022, 00:19:54 UTC | diagnose: add to command-list.txt Add 'git diagnose' as an "ancilliaryinterrogator" (like 'git bugreport') to 'command-list.txt' in order to have it show up in 'git help -a' and avoid the "no link" warning message from the 'check-docs' Makefile target. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2022, 00:27:26 UTC |
| e01b851 | Victoria Dye | 19 September 2022, 19:12:46 UTC | Documentation: add ReviewingGuidelines Add a reviewing guidelines document including advice and common terminology used in Git mailing list reviews. The document is included in the 'TECH_DOCS' list in order to include it in Git's published documentation. Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2022, 21:36:08 UTC |
| dda7228 | Junio C Hamano | 19 September 2022, 19:55:59 UTC | A bit more of remaining topics before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2022, 21:35:25 UTC |
| 279ebd4 | Junio C Hamano | 19 September 2022, 21:35:25 UTC | Merge branch 'ad/t1800-cygwin' Test fix. * ad/t1800-cygwin: t1800: correct test to handle Cygwin | 19 September 2022, 21:35:25 UTC |
| 42bf77c | Junio C Hamano | 19 September 2022, 21:35:25 UTC | Merge branch 'vd/scalar-to-main' Hoist the remainder of "scalar" out of contrib/ to the main part of the codebase. * vd/scalar-to-main: Documentation/technical: include Scalar technical doc t/perf: add 'GIT_PERF_USE_SCALAR' run option t/perf: add Scalar performance tests scalar-clone: add test coverage scalar: add to 'git help -a' command list scalar: implement the `help` subcommand git help: special-case `scalar` scalar: include in standard Git build & installation scalar: fix command documentation section header | 19 September 2022, 21:35:25 UTC |
| 9d58241 | Junio C Hamano | 19 September 2022, 21:35:24 UTC | Merge branch 'es/chainlint' Revamp chainlint script for our tests. * es/chainlint: chainlint: colorize problem annotations and test delimiters t: retire unused chainlint.sed t/Makefile: teach `make test` and `make prove` to run chainlint.pl test-lib: replace chainlint.sed with chainlint.pl test-lib: retire "lint harder" optimization hack t/chainlint: add more chainlint.pl self-tests chainlint.pl: allow `|| echo` to signal failure upstream of a pipe chainlint.pl: complain about loops lacking explicit failure handling chainlint.pl: don't flag broken &&-chain if failure indicated explicitly chainlint.pl: don't flag broken &&-chain if `$?` handled explicitly chainlint.pl: don't require `&` background command to end with `&&` t/Makefile: apply chainlint.pl to existing self-tests chainlint.pl: don't require `return|exit|continue` to end with `&&` chainlint.pl: validate test scripts in parallel chainlint.pl: add parser to identify test definitions chainlint.pl: add parser to validate tests chainlint.pl: add POSIX shell parser chainlint.pl: add POSIX shell lexical analyzer t: add skeleton chainlint.pl | 19 September 2022, 21:35:24 UTC |
| 298a958 | Junio C Hamano | 19 September 2022, 21:35:24 UTC | Merge branch 'jk/list-objects-filter-cleanup' A couple of bugfixes with code clean-up. * jk/list-objects-filter-cleanup: list-objects-filter: convert filter_spec to a strbuf list-objects-filter: add and use initializers list-objects-filter: handle null default filter spec list-objects-filter: don't memset after releasing filter struct | 19 September 2022, 21:35:24 UTC |
| f876b5a | Junio C Hamano | 19 September 2022, 21:35:24 UTC | Merge branch 'zh/ls-files-format' Typofix in the UI of a topic that has graduated to 'master'. * zh/ls-files-format: ls-files: fix black space in error message | 19 September 2022, 21:35:24 UTC |
| 339517b | Junio C Hamano | 19 September 2022, 21:35:23 UTC | Merge branch 'sy/mv-out-of-cone' "git mv A B" in a sparsely populated working tree can be asked to move a path from a directory that is "in cone" to another directory that is "out of cone". Handling of such a case has been improved. * sy/mv-out-of-cone: builtin/mv.c: fix possible segfault in add_slash() mv: check overwrite for in-to-out move advice.h: add advise_on_moving_dirty_path() mv: cleanup empty WORKING_DIRECTORY mv: from in-cone to out-of-cone mv: remove BOTH from enum update_mode mv: check if <destination> is a SKIP_WORKTREE_DIR mv: free the with_slash in check_dir_in_index() mv: rename check_dir_in_index() to empty_dir_has_sparse_contents() t7002: add tests for moving from in-cone to out-of-cone | 19 September 2022, 21:35:23 UTC |
| 12f1ae5 | Miaoqian Lin | 19 September 2022, 14:14:40 UTC | commit-graph: Fix missing closedir in expire_commit_graphs The function calls opendir() but missing the corresponding closedir() before exit the function. Add missing closedir() to fix it. Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Reviewed-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2022, 17:42:38 UTC |
| cb98e1d | Victoria Dye | 17 September 2022, 18:16:55 UTC | diagnose.c: refactor to safely use 'd_type' Refactor usage of the 'd_type' property of 'struct dirent' in 'diagnose.c' to instead utilize the compatibility macro 'DTYPE()'. On systems where 'd_type' is not present in 'struct dirent', this macro will always return 'DT_UNKNOWN'. In that case, instead fall back on using the 'stat.st_mode' to determine whether the dirent points to a dir, file, or link. Additionally, add a test to 't0092-diagnose.sh' to verify that files (e.g., loose objects) are counted properly. Note that the new function 'get_dtype()' is based on 'resolve_dtype()' in 'dir.c' (which itself was refactored from a prior 'get_dtype()' in ad6f2157f9 (dir: restructure in a way to avoid passing around a struct dirent, 2020-01-16)), but differs in that it is meant for use on arbitrary files, such as those inside the '.git' dir. Because of this, it does not search the index for a matching entry to derive the 'd_type'. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2022, 17:25:01 UTC |
| a275db6 | Jiang Xin | 19 September 2022, 02:50:10 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 (5482t0f0u) | 19 September 2022, 02:50:10 UTC |
| c1eb126 | Alexander Shopov | 18 September 2022, 18:27:26 UTC | l10n: bg.po: Updated Bulgarian translation (5482t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 18 September 2022, 19:34:22 UTC |
| ef926c6 | Peter Krefting | 16 September 2022, 21:03:08 UTC | l10n: sv.po: Update Swedish translation (5482t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 16 September 2022, 21:03:08 UTC |
| 365891d | Emir SARI | 16 September 2022, 19:22:08 UTC | l10n: tr: Update translations for v2.38.0 round #1 Signed-off-by: Emir SARI <emir_sari@icloud.com> | 16 September 2022, 19:26:06 UTC |
| 225e815 | Fangyi Zhou | 16 September 2022, 13:05:29 UTC | help: fix doubled words in explanation for developer interfaces Signed-off-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2022, 16:20:11 UTC |
| 4945f04 | Todd Zullinger | 16 September 2022, 06:23:03 UTC | api docs: link to html version of api-trace2 In f6d25d7878 (api docs: document that BUG() emits a trace2 error event, 2021-04-13), a link to the plain text version of api-trace2 was added in `technical/api-error-handling.txt`. All of our other `link:`s point to the html versions. Do the same here. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2022, 15:39:11 UTC |
| 086eaab | Todd Zullinger | 16 September 2022, 06:23:02 UTC | docs: fix a few recently broken links Some links were broken in the recent move of various technical docs c0f6dd49f1 (Merge branch 'ab/tech-docs-to-help', 2022-08-14). Fix them. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2022, 15:38:03 UTC |
| d3fa443 | Junio C Hamano | 15 September 2022, 22:38:46 UTC | Git 2.38-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2022, 23:09:47 UTC |
| ca20a44 | Junio C Hamano | 15 September 2022, 23:09:47 UTC | Merge branch 'jk/proto-v2-ref-prefix-fix' "git fetch" over protocol v2 sent an incorrect ref prefix request to the server and made "git pull" with configured fetch refspec that does not cover the remote branch to merge with fail, which has been corrected. * jk/proto-v2-ref-prefix-fix: fetch: add branch.*.merge to default ref-prefix extension fetch: stop checking for NULL transport->remote in do_fetch() | 15 September 2022, 23:09:47 UTC |
| b7f39a3 | Junio C Hamano | 15 September 2022, 23:09:46 UTC | Merge branch 'rs/add-p-worktree-mode-prompt-fix' Fix another UI regression in the reimplemented "add -p". * rs/add-p-worktree-mode-prompt-fix: add -p: fix worktree patch mode prompts | 15 September 2022, 23:09:46 UTC |
| 5ff02db | Junio C Hamano | 15 September 2022, 23:09:46 UTC | Merge branch 'js/typofix' Typofix. * js/typofix: Documentation: fix various repeat word typos | 15 September 2022, 23:09:46 UTC |
| d878d83 | Junio C Hamano | 15 September 2022, 23:09:46 UTC | Merge branch 'en/remerge-diff-fixes' Fix a few "git log --remerge-diff" bugs. * en/remerge-diff-fixes: diff: fix filtering of merge commits under --remerge-diff diff: fix filtering of additional headers under --remerge-diff diff: have submodule_format logic avoid additional diff headers | 15 September 2022, 23:09:46 UTC |
| c18eecb | Elijah Conners | 15 September 2022, 03:37:34 UTC | reftable: use a pointer for pq_entry param The speed of the merged_iter_pqueue_add() can be improved by using a pointer to the pq_entry struct, which is 96 bytes. Since the pq_entry param is worked directly on the stack and does not currently have a pointer to it, the merged_iter_pqueue_add() function is slightly slower. References to pq_entry in reftable have typically included pointers, such as both of the params for pq_less(). Since we are working with pointers in the pq_entry param, as keenly pointed out, the pq_entry param has also been made into a const since the contents of the pq_entry param are copied and not manipulated. Signed-off-by: Elijah Conners <business@elijahpepe.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2022, 18:32:37 UTC |
| 255a6f9 | Adam Dinwoodie | 15 September 2022, 07:57:17 UTC | t1800: correct test to handle Cygwin On Cygwin, when failing to spawn a process using start_command, Git outputs the same error as on Linux systems, rather than using the GIT_WINDOWS_NATIVE-specific error output. The WINDOWS test prerequisite is set in both Cygwin and native Windows environments, which means it's not appropriate to use to anticipate the error output from start_command. Instead, use the MINGW test prerequisite, which is only set for Git in native Windows environments, and not for Cygwin. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 September 2022, 17:29:51 UTC |
| 36f8e7e | Junio C Hamano | 14 September 2022, 19:56:22 UTC | Prepare for 2.38-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2022, 19:56:41 UTC |
| 08d61c7 | Junio C Hamano | 14 September 2022, 19:56:40 UTC | Merge branch 'jk/plug-list-object-filter-leaks' The code that manages list-object-filter structure, used in partial clones, leaked the instances, which has been plugged. * jk/plug-list-object-filter-leaks: prepare_repo_settings(): plug leak of config values list_objects_filter_options: plug leak of filter_spec strings transport: free filter options in disconnect_git() transport: deep-copy object-filter struct for fetch-pack list_objects_filter_copy(): deep-copy sparse_oid_name field | 14 September 2022, 19:56:40 UTC |
| b563638 | Junio C Hamano | 14 September 2022, 19:56:40 UTC | Merge branch 'ab/submodule-helper-leakfix' Plugging leaks in submodule--helper. * ab/submodule-helper-leakfix: submodule--helper: fix a configure_added_submodule() leak submodule--helper: free rest of "displaypath" in "struct update_data" submodule--helper: free some "displaypath" in "struct update_data" submodule--helper: fix a memory leak in print_status() submodule--helper: fix a leak in module_add() submodule--helper: fix obscure leak in module_add() submodule--helper: fix "reference" leak submodule--helper: fix a memory leak in get_default_remote_submodule() submodule--helper: fix a leak with repo_clear() submodule--helper: fix "sm_path" and other "module_cb_list" leaks submodule--helper: fix "errmsg_str" memory leak submodule--helper: add and use *_release() functions submodule--helper: don't leak {run,capture}_command() cp.dir argument submodule--helper: "struct pathspec" memory leak in module_update() submodule--helper: fix most "struct pathspec" memory leaks submodule--helper: fix trivial get_default_remote_submodule() leak submodule--helper: fix a leak in "clone_submodule" | 14 September 2022, 19:56:40 UTC |
| 7a54d74 | Junio C Hamano | 14 September 2022, 19:56:39 UTC | Merge branch 'ab/dedup-config-and-command-docs' Share the text used to explain configuration variables used by "git <subcmd>" in "git help <subcmd>" with the text from "git help config". * ab/dedup-config-and-command-docs: docs: add CONFIGURATION sections that fuzzy map to built-ins docs: add CONFIGURATION sections that map to a built-in log docs: de-duplicate configuration sections difftool docs: de-duplicate configuration sections notes docs: de-duplicate and combine configuration sections apply docs: de-duplicate configuration sections send-email docs: de-duplicate configuration sections grep docs: de-duplicate configuration sections docs: add and use include template for config/* includes | 14 September 2022, 19:56:40 UTC |
| dd407f1 | Junio C Hamano | 14 September 2022, 19:56:39 UTC | Merge branch 'ab/unused-annotation' Undoes 'jk/unused-annotation' topic and redoes it to work around Coccinelle rules misfiring false positives in unrelated codepaths. * ab/unused-annotation: git-compat-util.h: use "deprecated" for UNUSED variables git-compat-util.h: use "UNUSED", not "UNUSED(var)" | 14 September 2022, 19:56:39 UTC |
| a6b42ec | Junio C Hamano | 14 September 2022, 19:56:38 UTC | Merge branch 'jk/unused-annotation' Annotate function parameters that are not used (but cannot be removed for structural reasons), to prepare us to later compile with -Wunused warning turned on. * jk/unused-annotation: is_path_owned_by_current_uid(): mark "report" parameter as unused run-command: mark unused async callback parameters mark unused read_tree_recursive() callback parameters hashmap: mark unused callback parameters config: mark unused callback parameters streaming: mark unused virtual method parameters transport: mark bundle transport_options as unused refs: mark unused virtual method parameters refs: mark unused reflog callback parameters refs: mark unused each_ref_fn parameters git-compat-util: add UNUSED macro | 14 September 2022, 19:56:39 UTC |
| f6f0ee2 | René Scharfe | 14 September 2022, 09:47:33 UTC | add -p: fix worktree patch mode prompts cee6cb7300 (built-in add -p: implement the "worktree" patch modes, 2019-12-21) added the worktree patch modes to the built-in add -p. Its commit message claims to be a port of 2f0896ec3ad4 (restore: support --patch, 2019-04-25), which did the same for the script git-add--interactive.perl. The script mentioned only the worktree in its prompt messages in worktree mode, while the built-in mentions the worktree and also the index, even though the command doesn't actually affect the index. 2c8bd8471a (checkout -p: handle new files correctly, 2020-05-27) added new prompt messages for addition that also mention the index in worktree mode in the built-in, but not in the script. Correct these prompts to state that only the worktree will be affected. Reported-by: David Plumpton <david.plumpton@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2022, 18:14:38 UTC |
