summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-11-10l10n: fr: v2.34.0 rnd 3Libravatar Jean-Noël Avila1-93/+97
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-11-10Merge branch 'master' of github.com:alshopov/git-poLibravatar Jiang Xin1-4218/+4107
* 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5210t)
2021-11-10l10n: git.pot: v2.34.0 round 3 (1 new)Libravatar Jiang Xin1-92/+96
Generate po/git.pot from v2.34.0-rc2 for git v2.34.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2021-11-10Merge branch 'master' of github.com:git/gitLibravatar Jiang Xin12-20/+65
* 'master' of github.com:git/git: Git 2.34-rc2 parse-options.[ch]: revert use of "enum" for parse_options() t/lib-git.sh: fix ACL-related permissions failure A few fixes before -rc2 async_die_is_recursing: work around GCC v11.x issue on Fedora Document positive variant of commit and merge option "--no-verify" pull: honor --no-verify and do not call the commit-msg hook http-backend: remove a duplicated code branch
2021-11-09Git 2.34-rc2Libravatar Junio C Hamano2-2/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-09Merge branch 'ab/parse-options-cleanup'Libravatar Junio C Hamano2-10/+9
Last minute fix to the update already in 'master'. * ab/parse-options-cleanup: parse-options.[ch]: revert use of "enum" for parse_options()
2021-11-09Merge branch 'ad/ssh-signing-testfix'Libravatar Junio C Hamano1-0/+1
Fix ssh-signing test to work on a platform where the default ACL is overly loose to upset OpenSSH (reported on an installation of Cygwin). * ad/ssh-signing-testfix: t/lib-git.sh: fix ACL-related permissions failure
2021-11-09parse-options.[ch]: revert use of "enum" for parse_options()Libravatar Ævar Arnfjörð Bjarmason2-10/+9
Revert the parse_options() prototype change in my recent 352e761388b (parse-options.[ch]: consistently use "enum parse_opt_result", 2021-10-08) was incorrect. The parse_options() function returns the number of argc elements that haven't been processed, not "enum parse_opt_result". Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-09l10n: pl: 2.34.0 round 2Libravatar Arusekk1-254/+251
Signed-off-by: Arusekk <arek_koz@o2.pl>
2021-11-08l10n: vi(5210t): Translation for v2.34.0 rd2Libravatar Tran Ngoc Quan1-4239/+4588
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-11-07l10n: es: 2.34.0 round 2Libravatar Christopher Diaz Riveros1-4579/+5004
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> Signed-off-by: Omar Olivares <omar@olivares.cl> Signed-off-by: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2021-11-06l10n: Update Catalan translationLibravatar Jordi Mas1-6/+6
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2021-11-06l10n: bg.po: Updated Bulgarian translation (5210t)Libravatar Alexander Shopov1-4218/+4107
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2021-11-06Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poLibravatar Jiang Xin1-2189/+1528
* 'pt-PT' of github.com:git-l10n-pt-PT/git-po: l10n: pt_PT: cleaning duplicate translations (#2)
2021-11-06Merge branch 'l10n/zh_TW/211104' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-4295/+4661
* 'l10n/zh_TW/211104' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.34.0 round 2 (0 untranslated)
2021-11-05t/lib-git.sh: fix ACL-related permissions failureLibravatar Adam Dinwoodie1-0/+1
As well as checking that the relevant functionality is available, the GPGSSH prerequisite check creates the SSH keys that are used by the test functions it gates. If these keys are created in a directory that has a default Access Control List, the key files can inherit those permissions. This can result in a scenario where the private keys are created successfully, so the prerequisite check passes and the tests are run, but the key files have permissions that are too permissive, meaning OpenSSH will refuse to load them and the tests will fail. To avoid this happening, before creating the keys, clear any default ACL set on the directory that will contain them. This step allowed to fail; if setfacl isn't present, that's a very likely indicator that the filesystem in question simply doesn't support default ACLs. Helped-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-05l10n: fr: v2.34.0 round 2Libravatar Jean-Noël Avila1-815/+291
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-11-05Merge branch 'po-id' of github.com:bagasme/git-poLibravatar Jiang Xin1-308/+318
* 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.34 (round 2)
2021-11-05l10n: po-id for 2.34 (round 2)Libravatar Bagas Sanjaya1-308/+318
Translate following new components: * gpg-interface.c * send-pack.c * fetch-pack.c * upload-pack.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2021-11-05l10n: zh_TW.po: v2.34.0 round 2 (0 untranslated)Libravatar pan934121-4295/+4661
Signed-off-by: pan93412 <pan93412@gmail.com>
2021-11-05Merge branch 'master' of github.com:nafmo/git-l10n-svLibravatar Jiang Xin1-4207/+4575
* 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (5210t0f0u)
2021-11-05Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin1-232/+232
* 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN: 2.34.0 Round 2
2021-11-04l10n: sv.po: Update Swedish translation (5210t0f0u)Libravatar Peter Krefting1-4207/+4575
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2021-11-04A few fixes before -rc2Libravatar Junio C Hamano1-0/+7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-04Sync with maintLibravatar Junio C Hamano0-0/+0
2021-11-04Merge branch 'vd/pthread-setspecific-g11-fix' into maintLibravatar Junio C Hamano1-1/+1
One CI task based on Fedora image noticed a not-quite-kosher consturct recently, which has been corrected. * vd/pthread-setspecific-g11-fix: async_die_is_recursing: work around GCC v11.x issue on Fedora
2021-11-04Merge branch 'ma/doc-git-version' into maintLibravatar Junio C Hamano1-1/+1
Typofix. * ma/doc-git-version: git.txt: fix typo
2021-11-04Merge branch 'pw/rebase-r-fixes' into maintLibravatar Junio C Hamano2-1/+32
Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date
2021-11-04Merge branch 'jk/log-warn-on-bogus-encoding' into maintLibravatar Junio C Hamano3-14/+3
Squelch over-eager warning message added during this cycle. * jk/log-warn-on-bogus-encoding: log: document --encoding behavior on iconv() failure Revert "logmsg_reencode(): warn when iconv() fails"
2021-11-04Merge branch 'vd/pthread-setspecific-g11-fix'Libravatar Junio C Hamano1-1/+1
One CI task based on Fedora image noticed a not-quite-kosher consturct recently, which has been corrected. * vd/pthread-setspecific-g11-fix: async_die_is_recursing: work around GCC v11.x issue on Fedora
2021-11-04Merge branch 'rd/http-backend-code-simplification'Libravatar Junio C Hamano1-3/+1
Code simplification. * rd/http-backend-code-simplification: http-backend: remove a duplicated code branch
2021-11-04Merge branch 'ar/no-verify-doc'Libravatar Junio C Hamano3-4/+14
Doc update. * ar/no-verify-doc: Document positive variant of commit and merge option "--no-verify"
2021-11-04Merge branch 'ar/fix-git-pull-no-verify'Libravatar Junio C Hamano2-0/+30
"git pull --no-verify" did not affect the underlying "git merge". * ar/fix-git-pull-no-verify: pull: honor --no-verify and do not call the commit-msg hook
2021-11-04l10n: zh_CN: 2.34.0 Round 2Libravatar Fangyi Zhou1-232/+232
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2021-11-04l10n: tr: v2.34.0 round 2Libravatar Emir Sarı1-240/+246
Signed-off-by: Emir Sarı <bitigchi@me.com>
2021-11-03async_die_is_recursing: work around GCC v11.x issue on FedoraLibravatar Victoria Dye1-1/+1
This fix corrects an issue found in the `dockerized(pedantic, fedora)` CI build, first appearing after the introduction of a new version of the Fedora docker image version. This image includes a version of `glibc` with the attribute `__attr_access_none` added to `pthread_setspecific` [1], the implementation of which only exists for GCC 11.X - the version included in the Fedora image. The attribute requires that the pointer provided in the second argument of `pthread_getspecific` must, if not NULL, be a pointer to a valid object. In the usage in `async_die_is_recursing`, `(void *)1` is not valid, causing the error. This fix imitates a workaround added in SELinux [2] by using the pointer to the static `async_die_counter` itself as the second argument to `pthread_setspecific`. This guaranteed non-NULL, valid pointer matches the intent of the current usage while not triggering the build error. [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=a1561c3bbe8 [2] https://lore.kernel.org/all/20211021140519.6593-1-cgzones@googlemail.com/ Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Victoria Dye <vdye@github.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-04l10n: git.pot: v2.34.0 round 2 (3 new, 3 removed)Libravatar Jiang Xin1-230/+230
Generate po/git.pot from v2.34.0-rc1 for git v2.34.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2021-11-04Merge branch 'master' of github.com:git/gitLibravatar Jiang Xin25-85/+416
* 'master' of github.com:git/git: Git 2.34-rc1 rebase -i: fix rewording with --committer-date-is-author-date dir: fix directory-matching bug gpg-interface: avoid buffer overrun in parse_ssh_output() gpg-interface: handle missing " with " gracefully in parse_ssh_output() A few more topics before -rc1 i18n: fix typos found during l10n for git 2.34.0 t5310: drop lib-bundle.sh include format-patch (doc): clarify --base=auto gc: perform incremental repack when implictly enabled fsck: verify multi-pack-index when implictly enabled fsck: verify commit graph when implicitly enabled grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data commit-graph: don't consider "replace" objects with "verify" commit-graph tests: fix another graph_git_two_modes() helper commit-graph tests: fix error-hiding graph_git_two_modes() helper pretty: colorize pattern matches in commit messages grep: refactor next_match() and match_one_pattern() for external use
2021-11-04Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin1-4165/+4566
* 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh-CN: v2.34.0 round 1
2021-11-03Git 2.34-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-03Merge branch 'pw/rebase-r-fixes'Libravatar Junio C Hamano2-1/+32
Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date
2021-11-03Merge branch 'ds/add-rm-with-sparse-index'Libravatar Junio C Hamano2-1/+27
Regression fix. * ds/add-rm-with-sparse-index: dir: fix directory-matching bug
2021-11-03Merge branch 'jx/message-fixes'Libravatar Junio C Hamano3-3/+3
Fixes to recently added messages. * jx/message-fixes: i18n: fix typos found during l10n for git 2.34.0
2021-11-03Merge branch 'rs/ssh-signing-fix'Libravatar Junio C Hamano1-6/+8
Fixes to recently merged topic. * rs/ssh-signing-fix: gpg-interface: avoid buffer overrun in parse_ssh_output() gpg-interface: handle missing " with " gracefully in parse_ssh_output()
2021-11-03rebase -i: fix rewording with --committer-date-is-author-dateLibravatar Phillip Wood2-1/+32
baf8ec8d3a (rebase -r: don't write .git/MERGE_MSG when fast-forwarding, 2021-08-20) stopped reading the author script in run_git_commit() when rewording a commit. This is normally safe because "git commit --amend" preserves the authorship. However if the user passes "--committer-date-is-author-date" then we need to read the author date from the author script when rewording. Fix this regression by tightening the check for when it is safe to skip reading the author script. Reported-by: Jonas Kittner <jonas.kittner@ruhr-uni-bochum.de> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-03dir: fix directory-matching bugLibravatar Derrick Stolee2-1/+27
This reverts the change from ed49584 (dir: fix pattern matching on dirs, 2021-09-24), which claimed to fix a directory-matching problem without a test case. It turns out to _create_ a bug, but it is a bit subtle. The bug would have been revealed by the first of two tests being added to t0008-ignores.sh. The first uses a pattern "/git/" inside the a/.gitignores file, which matches against 'a/git/foo' but not 'a/git-foo/bar'. This test would fail before the revert. The second test shows what happens if the test instead uses a pattern "git/" and this test passes both before and after the revert. The difference in these two cases are due to how last_matching_pattern_from_list() checks patterns both if they have the PATTERN_FLAG_MUSTBEDIR and PATTERN_FLAG_NODIR flags. In the case of "git/", the PATTERN_FLAG_NODIR is also provided, making the change in behavior in match_pathname() not affect the end result of last_matching_pattern_from_list(). Reported-by: Glen Choo <chooglen@google.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-03l10n: pl: Update translationLibravatar Arusekk1-5201/+6301
Signed-off-by: Arusekk <arek_koz@o2.pl>
2021-11-02l10n: zh-CN: v2.34.0 round 1Libravatar Fangyi Zhou1-4165/+4566
Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>
2021-11-01gpg-interface: avoid buffer overrun in parse_ssh_output()Libravatar René Scharfe1-2/+2
If the string "key" we found in the output of ssh-keygen happens to be located at the very end of the line, then going four characters further leaves us beyond the end of the string. Explicitly search for the space after "key" to handle a missing one gracefully. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-01gpg-interface: handle missing " with " gracefully in parse_ssh_output()Libravatar René Scharfe1-4/+6
If the output of ssh-keygen starts with "Good \"git\" signature for ", but is not followed by " with " for some reason, then parse_ssh_output() uses -1 as the len parameter of xmemdupz(), which in turn will end the program. Reject the signature and carry on instead in that case. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 13:41:03 +0000