summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-04-17Git 2.36Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-17Merge tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-poLibravatar Junio C Hamano12-47530/+54917
l10n-2.36.0-rnd2.1 * tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (5282t0f0u) l10n: Update Catalan translation l10n: po-id for 2.36 (round 2) l10n: de.po: Update German translation l10n: zh_CN v2.36.0 round 2 l10n: pt_PT: update Portuguese translation l10n: vi(5285t): v2.36.0 round 2 l10n: zh_TW: v2.36.0 round 2 l10n: fr: v2.36 round 2 l10n: tr: v2.36.0 round 2 l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed) l10n: fr: v2.36 round 1 l10n: zh_CN v2.36.0 round 1 l10n: Update zh_CN repo link l10n: po-id for 2.36 (round 1) l10n: tr: v2.36.0 round 1 l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed) l10n: pt_PT: update TEAMS file l10n: pt_PT: update Portuguese translation
2022-04-17Merge branch 'cb/buggy-gcc-12-workaround'Libravatar Junio C Hamano1-0/+6
A couple of work around for CI breaking warnings from gcc 12. * cb/buggy-gcc-12-workaround: config.mak.dev: alternative workaround to gcc 12 warning in http.c config.mak.dev: workaround gcc 12 bug affecting "pedantic" CI job
2022-04-17l10n: sv.po: Update Swedish translation (5282t0f0u)Libravatar Peter Krefting1-3959/+4735
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2022-04-17Merge branch 'master' of github.com:Softcatala/git-poLibravatar Jiang Xin1-4044/+4892
* 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation
2022-04-16l10n: Update Catalan translationLibravatar Jordi Mas1-4044/+4892
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2022-04-16l10n: po-id for 2.36 (round 2)Libravatar Bagas Sanjaya1-287/+121
Translate following new components: * setup.c * split-index.c * strbuf.c * trailer.c Also delete obsolete strings. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-04-15config.mak.dev: alternative workaround to gcc 12 warning in http.cLibravatar Carlo Marcelo Arenas Belón1-0/+1
This provides a "no code change needed" option to the "fix" currently queued as part of ab/http-gcc-12-workaround and therefore should be reverted once that gets merged. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-15config.mak.dev: workaround gcc 12 bug affecting "pedantic" CI jobLibravatar Carlo Marcelo Arenas Belón1-0/+5
Originally noticed by Peff[1], but yet to be corrected[2] and planned to be released with Fedora 36 (scheduled for Apr 19). dir.c: In function ‘git_url_basename’: dir.c:3085:13: error: ‘memchr’ specified bound [9223372036854775808, 0] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overread] 3085 | if (memchr(start, '/', end - start) == NULL | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fedora is used as part of the CI, and therefore that release will trigger failures, unless the version of the image used is locked to an older release, as an alternative. Restricting the flag to the affected source file, as well as implementing an independent facility to track these workarounds was specifically punted to minimize the risk of introducing problems so close to a release. This change should be reverted once the underlying gcc bug is solved and which should be visible by NOT triggering a warning, otherwise. [1] https://lore.kernel.org/git/YZQhLh2BU5Hquhpo@coredump.intra.peff.net/ [2] https://bugzilla.redhat.com/show_bug.cgi?id=2075786 Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-15Merge branch 'master' of github.com:ruester/git-po-deLibravatar Jiang Xin1-4024/+4576
* 'master' of github.com:ruester/git-po-de: l10n: de.po: Update German translation
2022-04-15Merge branch 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin1-307/+65
* 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 2
2022-04-14Merge branch 'jc/revert-ref-transaction-hook-changes'Libravatar Junio C Hamano11-217/+19
Revert the "deletion of a ref should not trigger transaction events for loose and packed ref backends separately" that regresses the behaviour when a ref is not modified since it was packed. * jc/revert-ref-transaction-hook-changes: RelNotes: revert the description on the reverted topics Revert "fetch: increase test coverage of fetches" Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"
2022-04-14Merge branch 'jc/relnotes-updates'Libravatar Junio C Hamano1-6/+13
Wording updates for 2.36 release notes. * jc/relnotes-updates: RelNotes: mention safe.directory RelNotes: clarify "bisect run unexecutable" tweak
2022-04-14l10n: de.po: Update German translationLibravatar Matthias Rüster1-4024/+4576
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2022-04-14l10n: zh_CN v2.36.0 round 2Libravatar Fangyi Zhou1-307/+65
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-04-14l10n: pt_PT: update Portuguese translationLibravatar Daniel Santos1-6428/+7063
* update the following words translations: commit, untracked, stage, cache, stash, work..., index, reset, label, check..., tags, graft, alternate object, amend, ancestor, cherry-pick, bisect, blame, chain, cache, bug, chunk, branch, bundle, clean, clone, commit-graph, commit object, commit-ish, committer, cover letter, conflict, dangling, detach, dir, dumb, fast-forward, file system, fixup, fork, fetch, Git archive, gitdir, graft, replace ref * correct some mispellings * git-po-helper update * remove some obsolete lines * unfuzzy entries * random translation updates * update contact in pt_PT.po * add the following words to the translation table: override, recurse, print, offset, unbundle, mirror repository, multi-pack, bad, whitespace, batch * remove the following words of the translation table: core Git * change the following words on the translation table: dry-run, apply, patch, replay, blame, chain, gitdir, file system, fork, unset, handle * some translation to the first person * update copyright text * word 'utilização:' to 'uso:' * word 'pai' to 'parente' Signed-off-by: Daniel Santos <dacs.git@brilhante.top>
2022-04-14l10n: vi(5285t): v2.36.0 round 2Libravatar Tran Ngoc Quan1-3937/+4752
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2022-04-14Merge branch 'loc/tw/0407' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-3973/+4749
* 'loc/tw/0407' of github.com:l10n-tw/git-po: l10n: zh_TW: v2.36.0 round 2
2022-04-14l10n: zh_TW: v2.36.0 round 2Libravatar Yi-Jyun Pan1-3973/+4749
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2022-04-13RelNotes: revert the description on the reverted topicsLibravatar Junio C Hamano1-10/+0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13RelNotes: mention safe.directoryLibravatar Junio C Hamano1-2/+9
Helped-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13RelNotes: clarify "bisect run unexecutable" tweakLibravatar Junio C Hamano1-4/+4
We do not have to guess how common the mistake the change targets is when describing it. Such an argument may be good while proposing a change, but does not quite belong in the record of what has already happened, i.e. a release note. Helped-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Revert "fetch: increase test coverage of fetches"Libravatar Junio C Hamano2-93/+0
This reverts commit 2a0cafd464709cfa22fe7249290c644a2a26c520, as it expects a working "a ref deletion must produce a single transaction, not one for loose and another for packed" topic, which we do not have.
2022-04-13Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"Libravatar Junio C Hamano8-114/+19
This reverts commit 991b4d47f0accd3955d05927d5ce434e03ffbdb6, reversing changes made to bcd020f88e1e22f38422ac3f73ab06b34ec4bef1.
2022-04-13Sync with Git 2.35.3Libravatar Junio C Hamano9-3/+106
2022-04-13Git 2.35.3Libravatar Junio C Hamano11-5/+108
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Git 2.34.3Libravatar Junio C Hamano10-5/+104
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Git 2.33.3Libravatar Junio C Hamano9-5/+100
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Git 2.32.2Libravatar Junio C Hamano8-5/+96
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Git 2.31.3Libravatar Junio C Hamano7-5/+92
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13Git 2.30.4Libravatar Junio C Hamano3-2/+23
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13setup: opt-out of check with safe.directory=*Libravatar Derrick Stolee3-2/+21
With the addition of the safe.directory in 8959555ce (setup_git_directory(): add an owner check for the top-level directory, 2022-03-02) released in v2.35.2, we are receiving feedback from a variety of users about the feature. Some users have a very large list of shared repositories and find it cumbersome to add this config for every one of them. In a more difficult case, certain workflows involve running Git commands within containers. The container boundary prevents any global or system config from communicating `safe.directory` values from the host into the container. Further, the container almost always runs as a different user than the owner of the directory in the host. To simplify the reactions necessary for these users, extend the definition of the safe.directory config value to include a possible '*' value. This value implies that all directories are safe, providing a single setting to opt-out of this protection. Note that an empty assignment of safe.directory clears all previous values, and this is already the case with the "if (!value || !*value)" condition. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13setup: fix safe.directory key not being checkedLibravatar Matheus Valadares2-0/+8
It seems that nothing is ever checking to make sure the safe directories in the configs actually have the key safe.directory, so some unrelated config that has a value with a certain directory would also make it a safe directory. Signed-off-by: Matheus Valadares <me@m28.io> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13t0033: add tests for safe.directoryLibravatar Derrick Stolee2-1/+36
It is difficult to change the ownership on a directory in our test suite, so insert a new GIT_TEST_ASSUME_DIFFERENT_OWNER environment variable to trick Git into thinking we are in a differently-owned directory. This allows us to test that the config is parsed correctly. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13l10n: fr: v2.36 round 2Libravatar Jean-Noël Avila1-89/+165
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-04-13l10n: tr: v2.36.0 round 2Libravatar Emir SARI1-62/+84
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2022-04-13l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed)Libravatar Jiang Xin1-40/+52
Generate po/git.pot from v2.36.0-rc2 for git v2.36.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-04-13Merge branch 'master' of github.com:git/gitLibravatar Jiang Xin31-48/+331
* 'master' of github.com:git/git: (25 commits) Git 2.36-rc2 i18n: fix some badly formatted i18n strings Git 2.36-rc1 t9902: split test to run on appropriate systems ls-tree doc: document interaction with submodules Documentation: add --batch-command to cat-file synopsis git-ls-tree.txt: fix the name of "%(objectsize:padded)" submodule-helper: fix usage string doc: replace "--" with {litdd} in credential-cache/fsmonitor contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518 configure.ac: fix HAVE_SYNC_FILE_RANGE definition git-compat-util: really support openssl as a source of entropy ls-tree: `-l` should not imply recursive listing Git 2.35.2 Git 2.34.2 Git 2.33.2 Git 2.32.1 Git 2.31.2 Git 2.30.3 ...
2022-04-11Git 2.36-rc2Libravatar Junio C Hamano2-1/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-11Merge branch 'ja/i18n-fix-for-2.36'Libravatar Junio C Hamano2-5/+4
Fixes to some localizable strings. * ja/i18n-fix-for-2.36: i18n: fix some badly formatted i18n strings
2022-04-11Merge tag 'v2.35.2'Libravatar Junio C Hamano14-12/+272
2022-04-11i18n: fix some badly formatted i18n stringsLibravatar Jean-Noël Avila2-5/+4
String in submodule--helper is not correctly formatting placeholders. The string in git-send-email is partial. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-11Merge branch 'fr_2.36_rnd1' of github.com:jnavila/gitLibravatar Jiang Xin1-3969/+4717
* 'fr_2.36_rnd1' of github.com:jnavila/git: l10n: fr: v2.36 round 1
2022-04-11Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin2-3937/+4706
* 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 1 l10n: Update zh_CN repo link
2022-04-09l10n: fr: v2.36 round 1Libravatar Jean-Noël Avila1-3969/+4717
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-04-08Git 2.36-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-08Merge branch 'ld/sparse-index-bash-completion'Libravatar Junio C Hamano1-9/+26
Test regression fix. * ld/sparse-index-bash-completion: t9902: split test to run on appropriate systems
2022-04-08Merge branch 'tl/ls-tree-oid-only'Libravatar Junio C Hamano1-2/+2
Docfix. * tl/ls-tree-oid-only: ls-tree doc: document interaction with submodules
2022-04-08t9902: split test to run on appropriate systemsLibravatar Adam Dinwoodie1-9/+26
The "FUNNYNAMES" test prerequisite passes on Cygwin, as the Cygwin file system interface has a workaround for the underlying operating system's lack of support for tabs, newlines or quotes. However, it does not add support for backslash, which is treated as a directory separator, meaning one of the tests added by 48803821b1 ("completion: handle unusual characters for sparse-checkout", 2022-02-07) will fail on Cygwin. To avoid this failure while still getting maximal test coverage, split that test into two: test handling of paths that include tabs on anything that has the FUNNYNAMES prerequisite, but skip testing handling of paths that include backslashes unless both FUNNYNAMES is set and the system is not Cygwin. It might be nice to have more granularity than "FUNNYNAMES" and its sibling "FUNNIERNAMES" provide, so that tests could be run based on specific individual characters supported by the file system being tested, but that seems like it would make the prerequisite checks in this area much more verbose for very little gain. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-08ls-tree doc: document interaction with submodulesLibravatar Ævar Arnfjörð Bjarmason1-2/+2
The ls-tree documentation had never been updated after it learned to interact with submodules to explicitly mention them. The initial support was added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09). E.g. the discussion of --long added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09) didn't explicitly mention them. But this documentation added in 455923e0a15 (ls-tree: introduce "--format" option, 2022-03-23) had no such excuse, and was actively misleading by providing an exhaustive but incomplete list of object types we'd emit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 06:36:39 +0000