Skip to main content

Browse the archive

https://github.com/git/git
17 August 2024, 03:29:52 UTC
sort by:
Revision Author Date Message Commit Date
e9d7761 Junio C Hamano 24 November 2021, 18:55:13 UTC Git 2.34.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2021, 18:55:13 UTC
d62a765 Junio C Hamano 23 November 2021, 22:48:15 UTC Merge branch 'jc/save-restore-terminal-revert' into maint Regression fix for 2.34 * jc/save-restore-terminal-revert: Revert "editor: save and reset terminal after calling EDITOR" 23 November 2021, 22:48:15 UTC
eef0a8e Junio C Hamano 23 November 2021, 22:48:11 UTC Merge branch 'ds/add-rm-with-sparse-index' into maint Regression fix for 2.34 * ds/add-rm-with-sparse-index: dir: revert "dir: select directories correctly" 23 November 2021, 22:48:11 UTC
bcef4ba Junio C Hamano 23 November 2021, 22:48:08 UTC Merge branch 'ab/update-submitting-patches' into maint Doc fix. * ab/update-submitting-patches: SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section 23 November 2021, 22:48:08 UTC
ad03180 Junio C Hamano 23 November 2021, 22:48:04 UTC Merge branch 'ev/pull-already-up-to-date-is-noop' into maint "git pull" with any strategy when the other side is behind us should succeed as it is a no-op, but doesn't. * ev/pull-already-up-to-date-is-noop: pull: should be noop when already-up-to-date 23 November 2021, 22:48:04 UTC
a650ff5 Junio C Hamano 23 November 2021, 22:48:00 UTC Merge branch 'hm/paint-hits-in-log-grep' into maint "git grep" looking in a blob that has non-UTF8 payload was completely broken when linked with versions of PCREv2 library older than 10.34 in the latest release. * hm/paint-hits-in-log-grep: Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data" 23 November 2021, 22:48:00 UTC
e3f7e01 Junio C Hamano 22 November 2021, 23:04:20 UTC Revert "editor: save and reset terminal after calling EDITOR" This reverts commit 3d411afabc9a96f41d47c07d6af6edda3d29ec92, blindly opening /dev/tty and calling tcsetattr() seems to be causing problems. cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=577358 cf. https://lore.kernel.org/git/04ab7301-ea34-476c-eae4-4044fef74b91@gmail.com/ Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2021, 23:04:20 UTC
33c5d6c Derrick Stolee 19 November 2021, 14:13:49 UTC dir: revert "dir: select directories correctly" This reverts commit f6526728f950cacfd5b5e42bcc65f2c47f3da654. The change in f652672 (dir: select directories correctly, 2021-09-24) caused a regression in directory-based matches with non-cone-mode patterns, especially for .gitignore patterns. A test is included to prevent this regression in the future. The commit ed495847 (dir: fix pattern matching on dirs, 2021-09-24) was reverted in 5ceb663 (dir: fix directory-matching bug, 2021-11-02) for similar reasons. Neither commit changed tests, and tests added later in the series continue to pass when these commits are reverted. Reported-by: Danial Alihosseini <danial.alihosseini@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2021, 22:53:23 UTC
e7f3925 Junio C Hamano 19 November 2021, 17:06:36 UTC Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data" This reverts commit ae39ba431ab861548eb60b4bd2e1d8b8813db76f, as it breaks "grep" when looking for a string in non UTF-8 haystack, when linked with certain versions of PCREv2 library. Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 November 2021, 17:10:27 UTC
ea1954a Erwin Villejo 17 November 2021, 07:55:50 UTC pull: should be noop when already-up-to-date The already-up-to-date pull bug was fixed for --ff-only but it did not include the case where --ff or --ff-only are not specified. This updates the --ff-only fix to include the case where --ff or --ff-only are not specified in command line flags or config. Signed-off-by: Erwin Villejo <erwin.villejo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2021, 22:38:53 UTC
cd3e606 Junio C Hamano 15 November 2021, 06:50:52 UTC Git 2.34 Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 November 2021, 06:50:52 UTC
a288957 Junio C Hamano 15 November 2021, 05:45:40 UTC Merge tag 'l10n-2.34.0-rnd3.1' of git://github.com/git-l10n/git-po l10n-2.34.0-rnd3.1 * tag 'l10n-2.34.0-rnd3.1' of git://github.com/git-l10n/git-po: (38 commits) l10n: pl: 2.34.0 round 3 l10n: it: fix typos found by git-po-helper l10n: ko: fix typos found by git-po-helper l10n: Update Catalan translation l10n: po-id for 2.34 (round 3) l10n: bg.po: Updated Bulgarian translation (5211t) l10n: de.po: Update German translation for Git v2.34.0 l10n: sv.po: Update Swedish translation (5211t0f0) l10n: vi(5211t): Translation for v2.34.0 rd3 l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated) l10n: fr: v2.34.0 rnd 3 l10n: tr: v2.34.0 round 3 l10n: zh_CN: v2.34.0 round 3 l10n: git.pot: v2.34.0 round 3 (1 new) l10n: pl: 2.34.0 round 2 l10n: vi(5210t): Translation for v2.34.0 rd2 l10n: es: 2.34.0 round 2 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (5210t) l10n: fr: v2.34.0 round 2 ... 15 November 2021, 05:45:40 UTC
cae3877 Arusekk 14 November 2021, 14:19:13 UTC l10n: pl: 2.34.0 round 3 Signed-off-by: Arusekk <arek_koz@o2.pl> 14 November 2021, 14:19:23 UTC
5a0724a Jiang Xin 14 November 2021, 11:40:41 UTC l10n: it: fix typos found by git-po-helper Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 14 November 2021, 11:40:41 UTC
edbd9f3 Philippe Blain 13 November 2021, 20:38:05 UTC SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section A superfluous ']' was added to the title of the GitHub CI section in f003a91f5c (SubmittingPatches: replace discussion of Travis with GitHub Actions, 2021-07-22). Remove it. While at it, format the URL for a GitHub user's workflow runs of Git between backticks, since if not Asciidoc formats only the first part, "https://github.com/<Your", as a link, which is not very useful. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 November 2021, 07:41:54 UTC
4e13fcc Jiang Xin 11 November 2021, 00:54:16 UTC l10n: ko: fix typos found by git-po-helper When checking typos in file "po/ko.po", "git-po-helper" reports lots of false positives because there are no spaces between ASCII and Korean characters. After applied commit adee197 "(dict: add smudge table for Korean language, 2021-11-11)" of "git-l10n/git-po-helper" to suppress these false positives, some easy-to-fix typos are found and fixed. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 14 November 2021, 02:01:38 UTC
1293313 Jordi Mas 13 November 2021, 15:35:53 UTC l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> 13 November 2021, 15:35:53 UTC
1371836 Jiang Xin 13 November 2021, 06:42:30 UTC Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.34 (round 3) 13 November 2021, 06:42:30 UTC
d1dad7d Bagas Sanjaya 11 November 2021, 07:43:22 UTC l10n: po-id for 2.34 (round 3) - Translate following new components: * merge.c * rebase-interactive.c * rebase.c * midx.c - Clean up obsolete translations Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> 13 November 2021, 05:28:29 UTC
95d85f4 Jiang Xin 13 November 2021, 01:27:58 UTC Merge branch 'master' of github.com:ruester/git-po-de * 'master' of github.com:ruester/git-po-de: l10n: de.po: Update German translation for Git v2.34.0 13 November 2021, 01:27:58 UTC
5a73c6b Junio C Hamano 12 November 2021, 23:29:25 UTC Merge branch 'js/trace2-raise-format-version' When we added a new event type to trace2 event stream, we forgot to raise the format version number, which has been corrected. * js/trace2-raise-format-version: trace2: increment event format version 12 November 2021, 23:29:25 UTC
2c0fa66 Junio C Hamano 12 November 2021, 23:29:25 UTC Merge branch 'ab/fsck-unexpected-type' Regression fix. * ab/fsck-unexpected-type: object-file: free(*contents) only in read_loose_object() caller object-file: fix SEGV on free() regression in v2.34.0-rc2 12 November 2021, 23:29:25 UTC
8996d68 Junio C Hamano 12 November 2021, 23:29:24 UTC Merge branch 'ps/connectivity-optim' Regression fix. * ps/connectivity-optim: Revert "connected: do not sort input revisions" 12 November 2021, 23:29:24 UTC
5f93836 Alexander Shopov 12 November 2021, 07:00:54 UTC l10n: bg.po: Updated Bulgarian translation (5211t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 12 November 2021, 18:24:16 UTC
db92cdb Matthias Rüster 07 November 2021, 17:07:34 UTC l10n: de.po: Update German translation for Git v2.34.0 Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> 12 November 2021, 16:01:25 UTC
04480e6 Josh Steadmon 11 November 2021, 22:34:25 UTC trace2: increment event format version In 64bc752 (trace2: add trace2_child_ready() to report on background children, 2021-09-20), we added a new "child_ready" event. In Documentation/technical/api-trace2.txt, we promise that adding a new event type will result in incrementing the trace2 event format version number, but this was not done. Correct this in code & docs. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 November 2021, 23:01:04 UTC
f29b823 Peter Krefting 11 November 2021, 22:22:48 UTC l10n: sv.po: Update Swedish translation (5211t0f0) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 11 November 2021, 22:22:48 UTC
16235e3 Ævar Arnfjörð Bjarmason 11 November 2021, 05:18:56 UTC object-file: free(*contents) only in read_loose_object() caller In the preceding commit a free() of uninitialized memory regression in 96e41f58fe1 (fsck: report invalid object type-path combinations, 2021-10-01) was fixed, but we'd still have an issue with leaking memory from fsck_loose(). Let's fix that issue too. That issue was introduced in my 31deb28f5e0 (fsck: don't hard die on invalid object types, 2021-10-01). It can be reproduced under SANITIZE=leak with the test I added in 093fffdfbec (fsck tests: add test for fsck-ing an unknown type, 2021-10-01): ./t1450-fsck.sh --run=84 -vixd In some sense it's not a problem, we lost the same amount of memory in terms of things malloc'd and not free'd. It just moved from the "still reachable" to "definitely lost" column in valgrind(1) nomenclature[1], since we'd have die()'d before. But now that we don't hard die() anymore in the library let's properly free() it. Doing so makes this code much easier to follow, since we'll now have one function owning the freeing of the "contents" variable, not two. For context on that memory management pattern the read_loose_object() function was added in f6371f92104 (sha1_file: add read_loose_object() function, 2017-01-13) and subsequently used in c68b489e564 (fsck: parse loose object paths directly, 2017-01-13). The pattern of it being the task of both sides to free() the memory has been there in this form since its inception. 1. https://valgrind.org/docs/manual/mc-manual.html#mc-manual.leaks Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 November 2021, 21:40:43 UTC
a7df4f5 Junio C Hamano 11 November 2021, 20:34:41 UTC Revert "connected: do not sort input revisions" This reverts commit f45022dc2fd692fd024f2eb41a86a66f19013d43, as this is like breakage in the traversal more likely. In a history with 10 single strand of pearls, 1-->2-->3--...->7-->8-->9-->10 asking "rev-list --unsorted-input 1 10 --not 9 8 7 6 5 4" fails to paint the bottom 1 uninteresting as the traversal stops, without completing the propagation of uninteresting bit starting at 4 down through 3 and 2 to 1. 11 November 2021, 20:34:41 UTC
168a937 Ævar Arnfjörð Bjarmason 11 November 2021, 05:18:55 UTC object-file: fix SEGV on free() regression in v2.34.0-rc2 Fix a regression introduced in my 96e41f58fe1 (fsck: report invalid object type-path combinations, 2021-10-01). When fsck-ing blobs larger than core.bigFileThreshold, we'd free() a pointer to uninitialized memory. This issue would have been caught by SANITIZE=address, but since it involves core.bigFileThreshold, none of the existing tests in our test suite covered it. Running them with the "big_file_threshold" in "environment.c" changed to say "6" would have shown this failure, but let's add a dedicated test for this scenario based on Han Xin's report[1]. The bug was introduced between v9 and v10[2] of the fsck series merged in 061a21d36d8 (Merge branch 'ab/fsck-unexpected-type', 2021-10-25). 1. https://lore.kernel.org/git/20211111030302.75694-1-hanxin.hx@alibaba-inc.com/ 2. https://lore.kernel.org/git/cover-v10-00.17-00000000000-20211001T091051Z-avarab@gmail.com/ Reported-by: Han Xin <chiyutianyi@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 November 2021, 18:41:54 UTC
143b963 Tran Ngoc Quan 11 November 2021, 06:19:34 UTC l10n: vi(5211t): Translation for v2.34.0 rd3 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 11 November 2021, 06:19:34 UTC
2b98abc Jiang Xin 11 November 2021, 00:28:26 UTC Merge branch 'l10n/zh_TW/211111' of github.com:l10n-tw/git-po * 'l10n/zh_TW/211111' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated) 11 November 2021, 00:28:26 UTC
f35f250 Jiang Xin 11 November 2021, 00:27:49 UTC Merge branch 'fr_v2.34.0_rnd3' of github.com:jnavila/git * 'fr_v2.34.0_rnd3' of github.com:jnavila/git: l10n: fr: v2.34.0 rnd 3 11 November 2021, 00:27:49 UTC
1ffc358 Jiang Xin 11 November 2021, 00:26:54 UTC Merge branch 'tr-2-34-r3' of github.com:bitigchi/git-po * 'tr-2-34-r3' of github.com:bitigchi/git-po: l10n: tr: v2.34.0 round 3 11 November 2021, 00:26:54 UTC
4d53e91 Junio C Hamano 10 November 2021, 22:59:51 UTC A few hotfixes Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 November 2021, 23:01:21 UTC
fe319d5 Junio C Hamano 10 November 2021, 23:01:21 UTC Merge branch 'jk/ssh-signing-fix' 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 10 November 2021, 23:01:21 UTC
aace36f Junio C Hamano 10 November 2021, 23:01:20 UTC Merge branch 'js/simple-ipc-cygwin-socket-fix' 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 10 November 2021, 23:01:20 UTC
c1d16ce Junio C Hamano 10 November 2021, 23:01:20 UTC Merge branch 'ds/no-usable-cron-on-macos' "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 10 November 2021, 23:01:20 UTC
7c7cf62 Junio C Hamano 10 November 2021, 23:01:19 UTC Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date' "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 10 November 2021, 23:01:19 UTC
569a03f Yi-Jyun Pan 10 November 2021, 22:43:41 UTC l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated) Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> 10 November 2021, 22:43:41 UTC
ca7a5bf Jeff King 10 November 2021, 06:00:47 UTC t/lib-gpg: avoid broken versions of ssh-keygen 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> 10 November 2021, 22:14:37 UTC
bbb7d71 Jean-Noël Avila 10 November 2021, 21:01:57 UTC l10n: fr: v2.34.0 rnd 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 10 November 2021, 21:01:57 UTC
689a2aa Derrick Stolee 10 November 2021, 18:35:59 UTC maintenance: disable cron on macOS 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> 10 November 2021, 19:20:20 UTC
e9f197e Emir Sarı 10 November 2021, 18:21:28 UTC l10n: tr: v2.34.0 round 3 Signed-off-by: Emir Sarı <bitigchi@me.com> 10 November 2021, 18:21:28 UTC
974ef7c Johannes Schindelin 10 November 2021, 11:09:10 UTC simple-ipc: work around issues with Cygwin's Unix socket emulation 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> 10 November 2021, 17:12:19 UTC
ffa1451 Fangyi Zhou 10 November 2021, 12:29:09 UTC l10n: zh_CN: v2.34.0 round 3 Signed-off-by: Fangyi Zhou <me@fangyi.io> 10 November 2021, 12:33:51 UTC
bc9adb4 Jiang Xin 10 November 2021, 02:18:44 UTC Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5210t) 10 November 2021, 02:18:44 UTC
d834438 Jiang Xin 10 November 2021, 00:56:22 UTC l10n: git.pot: v2.34.0 round 3 (1 new) 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> 10 November 2021, 00:56:22 UTC
3a61600 Jiang Xin 10 November 2021, 00:55:14 UTC Merge branch 'master' of github.com:git/git * '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 10 November 2021, 00:55:14 UTC
6c22093 Junio C Hamano 09 November 2021, 21:19:51 UTC Git 2.34-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 November 2021, 21:19:51 UTC
84c99b2 Junio C Hamano 09 November 2021, 21:19:06 UTC Merge branch 'ab/parse-options-cleanup' Last minute fix to the update already in 'master'. * ab/parse-options-cleanup: parse-options.[ch]: revert use of "enum" for parse_options() 09 November 2021, 21:19:06 UTC
92dd0a5 Junio C Hamano 09 November 2021, 21:19:06 UTC Merge branch 'ad/ssh-signing-testfix' 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 09 November 2021, 21:19:06 UTC
06a199f Ævar Arnfjörð Bjarmason 09 November 2021, 11:04:43 UTC parse-options.[ch]: revert use of "enum" for parse_options() 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> 09 November 2021, 17:45:37 UTC
ed7fe7b Arusekk 09 November 2021, 13:48:08 UTC l10n: pl: 2.34.0 round 2 Signed-off-by: Arusekk <arek_koz@o2.pl> 09 November 2021, 13:59:51 UTC
d3600a1 Tran Ngoc Quan 08 November 2021, 01:39:44 UTC l10n: vi(5210t): Translation for v2.34.0 rd2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 08 November 2021, 02:02:58 UTC
09fb894 Christopher Diaz Riveros 10 October 2021, 11:28:14 UTC l10n: es: 2.34.0 round 2 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> 08 November 2021, 00:13:01 UTC
fa800af Jordi Mas 06 November 2021, 12:43:08 UTC l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> 06 November 2021, 12:43:08 UTC
ed5fa68 Alexander Shopov 06 November 2021, 10:31:37 UTC l10n: bg.po: Updated Bulgarian translation (5210t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 06 November 2021, 11:17:35 UTC
1b372d1 Jiang Xin 06 November 2021, 04:32:08 UTC Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-po * 'pt-PT' of github.com:git-l10n-pt-PT/git-po: l10n: pt_PT: cleaning duplicate translations (#2) 06 November 2021, 04:32:08 UTC
26274f2 Jiang Xin 06 November 2021, 04:16:02 UTC Merge branch 'l10n/zh_TW/211104' of github.com:l10n-tw/git-po * 'l10n/zh_TW/211104' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.34.0 round 2 (0 untranslated) 06 November 2021, 04:16:02 UTC
7140c49 Adam Dinwoodie 05 November 2021, 19:31:06 UTC t/lib-git.sh: fix ACL-related permissions failure 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> 05 November 2021, 20:44:37 UTC
3a7746a Jean-Noël Avila 05 November 2021, 19:41:17 UTC l10n: fr: v2.34.0 round 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 05 November 2021, 19:41:17 UTC
e1d1c94 Jiang Xin 05 November 2021, 11:48:09 UTC Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.34 (round 2) 05 November 2021, 11:48:09 UTC
3411fa0 Bagas Sanjaya 05 November 2021, 08:24:29 UTC l10n: po-id for 2.34 (round 2) Translate following new components: * gpg-interface.c * send-pack.c * fetch-pack.c * upload-pack.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> 05 November 2021, 09:50:31 UTC
048a41d pan93412 04 November 2021, 12:09:26 UTC l10n: zh_TW.po: v2.34.0 round 2 (0 untranslated) Signed-off-by: pan93412 <pan93412@gmail.com> 05 November 2021, 04:46:52 UTC
d42b4ce Jiang Xin 05 November 2021, 00:18:57 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 (5210t0f0u) 05 November 2021, 00:18:57 UTC
02f2875 Jiang Xin 05 November 2021, 00:17:50 UTC Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po * 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN: 2.34.0 Round 2 05 November 2021, 00:17:50 UTC
f776897 Peter Krefting 01 November 2021, 16:40:48 UTC l10n: sv.po: Update Swedish translation (5210t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 04 November 2021, 19:44:36 UTC
88d915a Junio C Hamano 04 November 2021, 19:24:46 UTC A few fixes before -rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 November 2021, 19:24:46 UTC
9cc14a5 Junio C Hamano 04 November 2021, 19:24:40 UTC Sync with maint 04 November 2021, 19:24:40 UTC
5fbd2fc Junio C Hamano 04 November 2021, 19:24:20 UTC Merge branch 'vd/pthread-setspecific-g11-fix' into maint 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 04 November 2021, 19:24:20 UTC
494cb27 Junio C Hamano 04 November 2021, 19:22:10 UTC Merge branch 'ma/doc-git-version' into maint Typofix. * ma/doc-git-version: git.txt: fix typo 04 November 2021, 19:22:10 UTC
ecb8d9d Junio C Hamano 04 November 2021, 19:20:14 UTC Merge branch 'pw/rebase-r-fixes' into maint Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date 04 November 2021, 19:20:14 UTC
99c7db5 Junio C Hamano 04 November 2021, 19:20:13 UTC Merge branch 'jk/log-warn-on-bogus-encoding' into maint 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" 04 November 2021, 19:20:13 UTC
a73934c Junio C Hamano 04 November 2021, 19:07:47 UTC Merge branch 'vd/pthread-setspecific-g11-fix' 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 04 November 2021, 19:07:47 UTC
ada03fc Junio C Hamano 04 November 2021, 19:07:46 UTC Merge branch 'rd/http-backend-code-simplification' Code simplification. * rd/http-backend-code-simplification: http-backend: remove a duplicated code branch 04 November 2021, 19:07:46 UTC
2b64708 Junio C Hamano 04 November 2021, 19:07:46 UTC Merge branch 'ar/no-verify-doc' Doc update. * ar/no-verify-doc: Document positive variant of commit and merge option "--no-verify" 04 November 2021, 19:07:46 UTC
a876f0b Junio C Hamano 04 November 2021, 19:07:46 UTC Merge branch 'ar/fix-git-pull-no-verify' "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 04 November 2021, 19:07:46 UTC
84bf71e Fangyi Zhou 04 November 2021, 11:02:05 UTC l10n: zh_CN: 2.34.0 Round 2 Signed-off-by: Fangyi Zhou <me@fangyi.io> 04 November 2021, 11:02:05 UTC
e4fa191 Emir Sarı 04 November 2021, 10:19:12 UTC l10n: tr: v2.34.0 round 2 Signed-off-by: Emir Sarı <bitigchi@me.com> 04 November 2021, 10:19:12 UTC
4b540cf Victoria Dye 04 November 2021, 04:01:03 UTC async_die_is_recursing: work around GCC v11.x issue on Fedora 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> 04 November 2021, 06:12:10 UTC
492288c Jiang Xin 04 November 2021, 00:35:51 UTC l10n: git.pot: v2.34.0 round 2 (3 new, 3 removed) 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> 04 November 2021, 00:35:51 UTC
bbf1932 Jiang Xin 04 November 2021, 00:34:15 UTC Merge branch 'master' of github.com:git/git * '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 04 November 2021, 00:34:15 UTC
66e6bab Jiang Xin 04 November 2021, 00:23:26 UTC Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po * 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh-CN: v2.34.0 round 1 04 November 2021, 00:23:26 UTC
876b142 Junio C Hamano 03 November 2021, 20:32:40 UTC Git 2.34-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 November 2021, 20:32:40 UTC
0cb1330 Junio C Hamano 03 November 2021, 20:32:28 UTC Merge branch 'pw/rebase-r-fixes' Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date 03 November 2021, 20:32:29 UTC
36f0a2e Junio C Hamano 03 November 2021, 20:32:28 UTC Merge branch 'ds/add-rm-with-sparse-index' Regression fix. * ds/add-rm-with-sparse-index: dir: fix directory-matching bug 03 November 2021, 20:32:28 UTC
e2a33ef Junio C Hamano 03 November 2021, 20:32:28 UTC Merge branch 'jx/message-fixes' Fixes to recently added messages. * jx/message-fixes: i18n: fix typos found during l10n for git 2.34.0 03 November 2021, 20:32:28 UTC
e890c84 Junio C Hamano 03 November 2021, 20:32:28 UTC Merge branch 'rs/ssh-signing-fix' 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() 03 November 2021, 20:32:28 UTC
9d6b9df Phillip Wood 02 November 2021, 21:30:51 UTC rebase -i: fix rewording with --committer-date-is-author-date 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> 03 November 2021, 17:44:45 UTC
5ceb663 Derrick Stolee 02 November 2021, 14:40:06 UTC dir: fix directory-matching bug 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> 03 November 2021, 17:10:36 UTC
6b53a80 Arusekk 29 September 2021, 17:34:21 UTC l10n: pl: Update translation Signed-off-by: Arusekk <arek_koz@o2.pl> 03 November 2021, 15:05:00 UTC
7e6630a Fangyi Zhou 02 November 2021, 18:04:10 UTC l10n: zh-CN: v2.34.0 round 1 Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io> 02 November 2021, 18:04:10 UTC
65db97b René Scharfe 30 October 2021, 17:07:38 UTC gpg-interface: avoid buffer overrun in parse_ssh_output() 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> 02 November 2021, 00:00:41 UTC
18b1850 René Scharfe 30 October 2021, 17:04:56 UTC gpg-interface: handle missing " with " gracefully in parse_ssh_output() 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> 02 November 2021, 00:00:41 UTC
0cddd84 Junio C Hamano 01 November 2021, 20:33:18 UTC A few more topics before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2021, 20:48:08 UTC
cfd86ee Junio C Hamano 01 November 2021, 20:48:08 UTC Merge branch 'ab/test-lib' Test (cosmetic) fix. * ab/test-lib: t5310: drop lib-bundle.sh include 01 November 2021, 20:48:08 UTC
7baf658 Junio C Hamano 01 November 2021, 20:48:08 UTC Merge branch 'jc/doc-format-patch-clarify-auto-base' Rephrase the description of "format-patch --base=auto". * jc/doc-format-patch-clarify-auto-base: format-patch (doc): clarify --base=auto 01 November 2021, 20:48:08 UTC
7afb458 Junio C Hamano 01 November 2021, 20:48:08 UTC Merge branch 'gc/use-repo-settings' It is wrong to read some settings directly from the config subsystem, as things like feature.experimental can affect their default values. * gc/use-repo-settings: gc: perform incremental repack when implictly enabled fsck: verify multi-pack-index when implictly enabled fsck: verify commit graph when implicitly enabled 01 November 2021, 20:48:08 UTC
b82299e Junio C Hamano 01 November 2021, 20:48:08 UTC Merge branch 'ab/ignore-replace-while-working-on-commit-graph' Teach "git commit-graph" command not to allow using replace objects at all, as we do not use the commit-graph at runtime when we see object replacement. * ab/ignore-replace-while-working-on-commit-graph: 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 01 November 2021, 20:48:08 UTC
back to top