| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
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
...
|
|
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
|
|
* 'po-id' of github.com:bagasme/git-po:
l10n: po-id for 2.38 (round 3)
|
|
* 'l10n-de-2.38-rnd3' of github.com:ralfth/git:
l10n: de.po: update German translation
|
|
* 'fr_2.38_rnd3' of github.com:jnavila/git:
l10n: fr: v2.38.0 round 3
|
|
* 'catalan' of github.com:Softcatala/git-po:
l10n: Update Catalan translation
|
|
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
|
|
Signed-off-by: Jordi Mas <jmas@softcatala.org>
|
|
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
|
|
Signed-off-by: Fangyi Zhou <me@fangyi.io>
|
|
* 'turkish' of github.com:bitigchi/git-po:
l10n: tr: v2.38.0 3rd round
|
|
* 'master' of github.com:alshopov/git-po:
l10n: bg.po: Updated Bulgarian translation (5484t)
|
|
Signed-off-by: Emir SARI <emir_sari@icloud.com>
|
|
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
|
|
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>
|
|
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
|
|
* 'main' of github.com:git/git:
Git 2.38-rc2
pack-bitmap: remove trace2 region from hot path
|
|
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>
|
|
Perf-fix.
* ds/bitmap-lookup-remove-tracing:
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>
|
|
Also fix a couple of typos.
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
|
|
Signed-off-by: Jordi Mas <jmas@softcatala.org>
|
|
* 'main' of github.com:git/git:
cmd-list.perl: fix identifying man sections
pack-bitmap: improve grammar of "xor chain" error message
|
|
* 'fr_quickfix' of github.com:jnavila/git:
l10n: fr: don't say that merge is "the default strategy"
|
|
* 'po-id' of github.com:bagasme/git-po:
l10n: po-id for 2.38 (round 2)
|
|
* 'turkish' of github.com:bitigchi/git-po:
l10n: tr: v2.38.0 round 2
|
|
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>
|
|
Grammofix.
* ac/bitmap-lookup-table:
pack-bitmap: improve grammar of "xor chain" error message
|
|
Fix manpage generation.
* ma/scalar-to-main-fix:
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>
|
|
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
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>
|
|
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>
|
|
Signed-off-by: Emir SARI <emir_sari@icloud.com>
|
|
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
|
|
* '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
|
|
* 'catalan' of github.com:Softcatala/git-po:
l10n: Update Catalan translation
|
|
* 'l10n-de-2.38' of github.com:ralfth/git:
l10n: de.po: update German translation
|
|
* '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
|
|
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
|
|
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
|
|
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
|
|
Signed-off-by: hbossot <hbossot@profideo.com>
|
|
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>
|
|
Signed-off-by: Jordi Mas <jmas@softcatala.org>
|
|
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Fix messages incorrectly marked for translation.
* sg/parse-options-subcommand:
gc: don't translate literal commands
|
|
* js/typofix:
Documentation: clean up various typos in technical docs
Documentation: clean up a few misspelled word typos
|
