summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-11l10n: vi(5211t): Translation for v2.34.0 rd3Tran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-11-11Merge branch 'l10n/zh_TW/211111' of github.com:l10n-tw/git-poJiang Xin
* 'l10n/zh_TW/211111' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated)
2021-11-11Merge branch 'fr_v2.34.0_rnd3' of github.com:jnavila/gitJiang Xin
* 'fr_v2.34.0_rnd3' of github.com:jnavila/git: l10n: fr: v2.34.0 rnd 3
2021-11-11Merge branch 'tr-2-34-r3' of github.com:bitigchi/git-poJiang Xin
* 'tr-2-34-r3' of github.com:bitigchi/git-po: l10n: tr: v2.34.0 round 3
2021-11-10A few hotfixesJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-10Merge branch 'jk/ssh-signing-fix'Junio C Hamano
Reject OpenSSH 8.7 whose "ssh-keygen -Y find-principals" is unusable from running the ssh signature tests. * jk/ssh-signing-fix: t/lib-gpg: avoid broken versions of ssh-keygen
2021-11-10Merge branch 'js/simple-ipc-cygwin-socket-fix'Junio C Hamano
The way Cygwin emulates a unix-domain socket, on top of which the simple-ipc mechanism is implemented, can race with the program on the other side that wants to use the socket, and briefly make it appear as a regular file before lstat(2) starts reporting it as a socket. We now have a workaround on the side that connects to a unix domain socket. * js/simple-ipc-cygwin-socket-fix: simple-ipc: work around issues with Cygwin's Unix socket emulation
2021-11-10Merge branch 'ds/no-usable-cron-on-macos'Junio C Hamano
"git maintenance run" learned to use system supplied scheduler backend, but cron on macOS turns out to be unusable for this purpose. * ds/no-usable-cron-on-macos: maintenance: disable cron on macOS
2021-11-10Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano
"git pull --ff-only" and "git pull --rebase --ff-only" should make it a no-op to attempt pulling from a remote that is behind us, but instead the command errored out by saying it was impossible to fast-forward, which may technically be true, but not a useful thing to diagnose as an error. This has been corrected. * jc/fix-pull-ff-only-when-already-up-to-date: pull: --ff-only should make it a noop when already-up-to-date
2021-11-10l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated)Yi-Jyun Pan
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2021-11-10t/lib-gpg: avoid broken versions of ssh-keygenJeff King
The "-Y find-principals" option of ssh-keygen seems to be broken in Debian's openssh-client 1:8.7p1-1, whereas it works fine in 1:8.4p1-5. This causes several failures for GPGSSH tests. We fulfill the prerequisite because generating the keys works fine, but actually verifying a signature causes results ranging from bogus results to ssh-keygen segfaulting. We can find the broken version during the prereq check by feeding it empty input. This should result in it complaining to stderr, but in the broken version it triggers the segfault, causing the GPGSSH tests to be skipped. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-10l10n: fr: v2.34.0 rnd 3Jean-Noël Avila
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-11-10maintenance: disable cron on macOSDerrick Stolee
In eba1ba9 (maintenance: `git maintenance run` learned `--scheduler=<scheduler>`, 2021-09-04), we introduced the ability to specify a scheduler explicitly. This led to some extra checks around whether an alternative scheduler was available. This added the functionality of removing background maintenance from schedulers other than the one selected. On macOS, cron is technically available, but running 'crontab' triggers a UI prompt asking for special permissions. This is the major reason why launchctl is used as the default scheduler. The is_crontab_available() method triggers this UI prompt, causing user disruption. Remove this disruption by using an #ifdef to prevent running crontab this way on macOS. This has the unfortunate downside that if a user manually selects cron via the '--scheduler' option, then adjusting the scheduler later will not remove the schedule from cron. The '--scheduler' option ignores the is_available checks, which is how we can get into this situation. Extract the new check_crontab_process() method to avoid making the 'child' variable unused on macOS. The method is marked MAYBE_UNUSED because it has no callers on macOS. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-10l10n: tr: v2.34.0 round 3Emir Sarı
Signed-off-by: Emir Sarı <bitigchi@me.com>
2021-11-10simple-ipc: work around issues with Cygwin's Unix socket emulationJohannes Schindelin
Cygwin emulates Unix sockets by writing files with custom contents and then marking them as system files. The tricky problem is that while the file is written and its `system` bit is set, it is still identified as a file. This caused test failures when Git is too fast looking for the Unix sockets and then complains that there is a plain file in the way. Let's work around this by adding a delayed retry loop, specifically for Cygwin. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-10l10n: zh_CN: v2.34.0 round 3Fangyi Zhou
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2021-11-10Merge branch 'master' of github.com:alshopov/git-poJiang Xin
* '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)Jiang Xin
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/gitJiang Xin
* '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-rc2v2.34.0-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-09Merge branch 'ab/parse-options-cleanup'Junio C Hamano
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'Junio C Hamano
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()Ævar Arnfjörð Bjarmason
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 2Arusekk
Signed-off-by: Arusekk <arek_koz@o2.pl>
2021-11-08l10n: vi(5210t): Translation for v2.34.0 rd2Tran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-11-08l10n: es: 2.34.0 round 2Christopher Diaz Riveros
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 translationJordi Mas
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2021-11-06l10n: bg.po: Updated Bulgarian translation (5210t)Alexander Shopov
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2021-11-06Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin
* '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-poJiang Xin
* '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 failureAdam Dinwoodie
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 2Jean-Noël Avila
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-11-05Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin
* '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)Bagas Sanjaya
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)pan93412
Signed-off-by: pan93412 <pan93412@gmail.com>
2021-11-05Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin
* '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-poJiang Xin
* '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)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2021-11-04A few fixes before -rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-11-04Sync with maintJunio C Hamano
2021-11-04Merge branch 'vd/pthread-setspecific-g11-fix' into maintJunio C Hamano
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 maintJunio C Hamano
Typofix. * ma/doc-git-version: git.txt: fix typo
2021-11-04Merge branch 'pw/rebase-r-fixes' into maintJunio C Hamano
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 maintJunio C Hamano
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'Junio C Hamano
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'Junio C Hamano
Code simplification. * rd/http-backend-code-simplification: http-backend: remove a duplicated code branch
2021-11-04Merge branch 'ar/no-verify-doc'Junio C Hamano
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'Junio C Hamano
"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 2Fangyi Zhou
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2021-11-04l10n: tr: v2.34.0 round 2Emir Sarı
Signed-off-by: Emir Sarı <bitigchi@me.com>