| 225bc32 | Junio C Hamano | 16 August 2021, 19:15:44 UTC | Git 2.33 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2021, 19:15:44 UTC |
| b06a504 | Junio C Hamano | 16 August 2021, 19:14:35 UTC | Merge branch 'rs/oidtree-alignment-fix' Codepath to access recently added oidtree data structure had to make unaligned accesses to oids, which has been corrected. * rs/oidtree-alignment-fix: oidtree: avoid unaligned access to crit-bit tree | 16 August 2021, 19:14:35 UTC |
| f7cd3c0 | Junio C Hamano | 16 August 2021, 16:38:57 UTC | Merge tag 'l10n-2.33.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.33.0-rnd2 * tag 'l10n-2.33.0-rnd2' of git://github.com/git-l10n/git-po: (46 commits) l10n: sv.po: Update Swedish translation (5230t0f0u) l10n: TEAMS: change Simplified Chinese team leader l10n: tr: v2.33 (round 2) l10n: es: 2.33.0 round 2 l10n: zh_CN: for git v2.33.0 l10n round 2 l10n: zh_CN: Revision for git v2.32.0 l10n round 1 l10n: README: refactor to use GFM syntax l10n: update German translation for Git v2.33.0 (rnd2) l10n: pt_PT: v2.33.0 round 2 l10n: pt_PT: git-po-helper update l10n: pt_PT: update translation table l10n: zh_TW.po: remove the obsolete glossary l10n: vi.po(5230t): Updated translation for v2.32.0 round 2 l10n: fr.po v2.33 rnd 2 l10n: id: po-id for 2.33.0 round 2 l10n: zh_TW.po: update for v2.33.0 rnd 2 l10n: git.pot: v2.33.0 round 2 (11 new, 8 removed) l10n: de.po: fix typos l10n: update German translation for Git v2.33.0 l10n: fr.po fix typos in commands and variables ... | 16 August 2021, 16:38:57 UTC |
| efedbb1 | Peter Krefting | 14 August 2021, 20:15:58 UTC | l10n: sv.po: Update Swedish translation (5230t0f0u) Also fixed some typos reported by "git-po-helper". Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 August 2021, 22:54:20 UTC |
| cfeae5a | Jiang Xin | 15 August 2021, 22:39:30 UTC | l10n: TEAMS: change Simplified Chinese team leader Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 August 2021, 22:39:30 UTC |
| 8bcda98 | René Scharfe | 14 August 2021, 20:00:38 UTC | oidtree: avoid unaligned access to crit-bit tree The flexible array member "k" of struct cb_node is used to store the key of the crit-bit tree node. It offers no alignment guarantees -- in fact the current struct layout puts it one byte after a 4-byte aligned address, i.e. guaranteed to be misaligned. oidtree uses a struct object_id as cb_node key. Since cf0983213c (hash: add an algo member to struct object_id, 2021-04-26) it requires 4-byte alignment. The mismatch is reported by UndefinedBehaviorSanitizer at runtime like this: hash.h:277:2: runtime error: member access within misaligned address 0x00015000802d for type 'struct object_id', which requires 4 byte alignment 0x00015000802d: note: pointer points here 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ^ SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior hash.h:277:2 in We can fix that by: 1. eliminating the alignment requirement of struct object_id, 2. providing the alignment in struct cb_node, or 3. avoiding the issue by only using memcpy to access "k". Currently we only store one of two values in "algo" in struct object_id. We could use a uint8_t for that instead and widen it only once we add support for our twohundredth algorithm or so. That would not only avoid alignment issues, but also reduce the memory requirements for each instance of struct object_id by ca. 9%. Supporting keys with alignment requirements might be useful to spread the use of crit-bit trees. It can be achieved by using a wider type for "k" (e.g. uintmax_t), using different types for the members "byte" and "otherbits" (e.g. uint16_t or uint32_t for each), or by avoiding the use of flexible arrays like khash.h does. This patch implements the third option, though, because it has the least potential for causing side-effects and we're close to the next release. If one of the other options is implemented later as well to get their additional benefits we can get rid of the extra copies introduced here. Reported-by: Andrzej Hunt <andrzej@ahunt.org> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2021, 20:13:50 UTC |
| 2899460 | Jiang Xin | 15 August 2021, 10:32:20 UTC | Merge branch 'next' of github.com:ChrisADR/git-po * 'next' of github.com:ChrisADR/git-po: l10n: es: 2.33.0 round 2 | 15 August 2021, 10:32:20 UTC |
| 8f333b5 | Emir Sarı | 15 August 2021, 07:17:15 UTC | l10n: tr: v2.33 (round 2) Signed-off-by: Emir Sarı <bitigchi@me.com> | 15 August 2021, 07:17:15 UTC |
| 92c199f | Christopher Diaz Riveros | 14 August 2021, 16:13:11 UTC | l10n: es: 2.33.0 round 2 Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Javier Spagnoletti phansys@gmail.com Signed-off-by: Cleydyr Albuquerque <cleydyr@gmail.com> Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Guillermo Ramos <gramosg> | 15 August 2021, 04:28:05 UTC |
| ec3d460 | Jiang Xin | 02 August 2021, 00:25:39 UTC | l10n: zh_CN: for git v2.33.0 l10n round 2 Translate 48 new messages (5230t0f0u) for git 2.33.0, and also fixed typos found by "git-po-helper". Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io> | 15 August 2021, 03:16:07 UTC |
| 523ccf5 | Fangyi Zhou | 07 June 2021, 04:59:56 UTC | l10n: zh_CN: Revision for git v2.32.0 l10n round 1 Signed-off-by: Fangyi Zhou <me@fangyi.io> | 15 August 2021, 02:56:49 UTC |
| cb92e28 | Jiang Xin | 06 August 2021, 03:07:48 UTC | l10n: README: refactor to use GFM syntax Format README.md using GFM (GitHub Flavored Markdown) syntax. - In order to use more than 3 level headings, use ATX style headings instead of setext style headings. - In order to add highlights for code blocks, use fenced code blocks instead of indented code blocks. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 August 2021, 02:55:16 UTC |
| fb2aace | Jiang Xin | 15 August 2021, 02:26:18 UTC | Merge branch 'l10n-2.33-rnd2' of github.com:ralfth/git * 'l10n-2.33-rnd2' of github.com:ralfth/git: l10n: update German translation for Git v2.33.0 (rnd2) | 15 August 2021, 02:26:18 UTC |
| 813147b | Jiang Xin | 15 August 2021, 02:24:24 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: v2.33.0 round 2 l10n: pt_PT: git-po-helper update l10n: pt_PT: update translation table | 15 August 2021, 02:24:24 UTC |
| 4e7e753 | Ralf Thielow | 14 August 2021, 14:35:44 UTC | l10n: update German translation for Git v2.33.0 (rnd2) Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 14 August 2021, 14:35:44 UTC |
| fd3e513 | Daniel Santos | 14 August 2021, 12:02:31 UTC | l10n: pt_PT: v2.33.0 round 2 * translation of new entries Signed-off-by: Daniel Santos <hello@brighterdan.com> | 14 August 2021, 14:13:11 UTC |
| 7d3bc08 | Daniel Santos | 14 August 2021, 11:08:39 UTC | l10n: pt_PT: git-po-helper update * run git-po-helper update pt_PT.po Signed-off-by: Daniel Santos <hello@brighterdan.com> | 14 August 2021, 14:13:11 UTC |
| 88e7a93 | Daniel Santos | 12 August 2021, 21:13:03 UTC | l10n: pt_PT: update translation table * updated translation table Signed-off-by: Daniel Santos <hello@brighterdan.com> | 14 August 2021, 14:13:04 UTC |
| 309f8cf | Jiang Xin | 14 August 2021, 11:30:54 UTC | Merge branch 'loc/zh_TW/210814' of github.com:l10n-tw/git-po * 'loc/zh_TW/210814' of github.com:l10n-tw/git-po: l10n: zh_TW.po: remove the obsolete glossary l10n: zh_TW.po: update for v2.33.0 rnd 2 | 14 August 2021, 11:30:54 UTC |
| 508b357 | Yi-Jyun Pan | 14 August 2021, 06:11:42 UTC | l10n: zh_TW.po: remove the obsolete glossary Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 14 August 2021, 11:07:58 UTC |
| 37eabbe | Jiang Xin | 14 August 2021, 09:02:54 UTC | Merge branch 'master' of github.com:vnwildman/git * 'master' of github.com:vnwildman/git: l10n: vi.po(5230t): Updated translation for v2.32.0 round 2 | 14 August 2021, 09:02:54 UTC |
| 9b272da | Jiang Xin | 14 August 2021, 09:01:27 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: id: po-id for 2.33.0 round 2 | 14 August 2021, 09:01:27 UTC |
| 86e24f5 | Tran Ngoc Quan | 14 August 2021, 07:54:44 UTC | l10n: vi.po(5230t): Updated translation for v2.32.0 round 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 14 August 2021, 07:54:44 UTC |
| 0934645 | Jean-Noël Avila | 14 August 2021, 06:28:48 UTC | l10n: fr.po v2.33 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 14 August 2021, 06:28:48 UTC |
| 2640b6a | Bagas Sanjaya | 14 August 2021, 02:35:18 UTC | l10n: id: po-id for 2.33.0 round 2 Update translation for following component: * builtin/submodule--helper.c Translate following new component: * builtin/revert.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 14 August 2021, 06:17:13 UTC |
| 81e30fc | Yi-Jyun Pan | 14 August 2021, 05:48:09 UTC | l10n: zh_TW.po: update for v2.33.0 rnd 2 Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 14 August 2021, 06:01:59 UTC |
| 55095d0 | Jiang Xin | 14 August 2021, 03:52:34 UTC | Merge branch 'master' of github.com:vnwildman/git * 'master' of github.com:vnwildman/git: l10n: vi.po(5227t): Fixed typo after run git-po-helper | 14 August 2021, 03:52:34 UTC |
| bbc7dcc | Jiang Xin | 13 August 2021, 23:57:34 UTC | l10n: git.pot: v2.33.0 round 2 (11 new, 8 removed) Generate po/git.pot from v2.33.0-rc2 for git v2.33.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 13 August 2021, 23:57:34 UTC |
| 117e2ca | Jiang Xin | 13 August 2021, 23:56:22 UTC | Merge branch 'master' of github.com:git/git * 'master' of github.com:git/git: (51 commits) Git 2.33-rc2 object-file: use unsigned arithmetic with bit mask Revert 'diff-merges: let "-m" imply "-p"' object-store: avoid extra ';' from KHASH_INIT oidtree: avoid nested struct oidtree_node Git 2.33-rc1 test: fix for COLUMNS and bash 5 The eighth batch diff: --pickaxe-all typofix mingw: align symlinks-related rmdir() behavior with Linux t7508: avoid non POSIX BRE use fspathhash() everywhere t0001: fix broken not-quite getcwd(3) test in bed67874e2 Documentation: render special characters correctly reset: clear_unpack_trees_porcelain to plug leak builtin/rebase: fix options.strategy memory lifecycle builtin/merge: free found_ref when done builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv convert: release strbuf to avoid leak read-cache: call diff_setup_done to avoid leak ... | 13 August 2021, 23:56:22 UTC |
| 18c9fce | Jiang Xin | 13 August 2021, 23:55:01 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 (5227t0f0u) | 13 August 2021, 23:55:01 UTC |
| 738cdce | Jiang Xin | 13 August 2021, 23:54:38 UTC | Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5227t) | 13 August 2021, 23:54:38 UTC |
| 37a65ae | Jiang Xin | 13 August 2021, 23:50:33 UTC | Merge branch 'l10n-2.33' of github.com:ralfth/git * 'l10n-2.33' of github.com:ralfth/git: l10n: de.po: fix typos l10n: update German translation for Git v2.33.0 | 13 August 2021, 23:50:33 UTC |
| 1dcaad9 | Jiang Xin | 13 August 2021, 23:45:37 UTC | Merge branch 'fr_fix_typos' of github.com:jnavila/git * 'fr_fix_typos' of github.com:jnavila/git: l10n: fr.po fix typos in commands and variables | 13 August 2021, 23:45:37 UTC |
| 14eb184 | Jiang Xin | 13 August 2021, 23:44:41 UTC | Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 13 August 2021, 23:44:41 UTC |
| a90b519 | Ralf Thielow | 13 August 2021, 15:07:04 UTC | l10n: de.po: fix typos Fix some typos found by `./git-po-helper check-po po/de.po`. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 13 August 2021, 18:22:48 UTC |
| d4c5a0c | Ralf Thielow | 09 August 2021, 14:50:31 UTC | l10n: update German translation for Git v2.33.0 Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 13 August 2021, 18:22:43 UTC |
| 95862fa | Jean-Noël Avila | 12 August 2021, 19:09:51 UTC | l10n: fr.po fix typos in commands and variables Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 12 August 2021, 19:14:15 UTC |
| ea75369 | Bagas Sanjaya | 12 August 2021, 10:18:29 UTC | l10n: id: mismatch variable name fixes Jiang Xin reported possible typos in po/id.po, all of them are mismatch variable names. Fix them. Reported-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 12 August 2021, 10:18:29 UTC |
| 2be328e | Tran Ngoc Quan | 12 August 2021, 07:05:39 UTC | l10n: vi.po(5227t): Fixed typo after run git-po-helper Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 12 August 2021, 07:05:39 UTC |
| b50be84 | Jordi Mas | 12 August 2021, 06:07:32 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 12 August 2021, 06:07:32 UTC |
| 41a03e2 | Jiang Xin | 12 August 2021, 00:23:55 UTC | Merge branch 'daniel' of github.com:git-l10n-pt-PT/git-po * 'daniel' of github.com:git-l10n-pt-PT/git-po: l10n: pt_PT: cleaning flags mismatch l10n: pt_PT: cleaning duplicate translations l10n: pt_PT: update translation tables l10n: pt_PT: translated git v2.33.0 l10n: pt_PT: update git-po-helper l10n: pt_PT: remove trailing comments l10n: pt_PT: translation tables l10n: pt_PT: add Portuguese translations part 5 l10n: pt_PT: add Portuguese translations part 4 | 12 August 2021, 00:23:55 UTC |
| 5d213e4 | Junio C Hamano | 11 August 2021, 18:54:03 UTC | Git 2.33-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2021, 19:36:18 UTC |
| 4c90d89 | Junio C Hamano | 11 August 2021, 19:36:18 UTC | Merge branch 'jn/log-m-does-not-imply-p' Earlier "git log -m" was changed to always produce patch output, which would break existing scripts, which has been reverted. * jn/log-m-does-not-imply-p: Revert 'diff-merges: let "-m" imply "-p"' | 11 August 2021, 19:36:18 UTC |
| 7cfaa86 | Junio C Hamano | 11 August 2021, 19:36:17 UTC | Merge branch 'cb/many-alternate-optim-fixup' Build fix. * cb/many-alternate-optim-fixup: object-file: use unsigned arithmetic with bit mask object-store: avoid extra ';' from KHASH_INIT oidtree: avoid nested struct oidtree_node | 11 August 2021, 19:36:17 UTC |
| 581a3bb | René Scharfe | 06 August 2021, 17:53:47 UTC | object-file: use unsigned arithmetic with bit mask 33f379eee6 (make object_directory.loose_objects_subdir_seen a bitmap, 2021-07-07) replaced a wasteful 256-byte array with a 32-byte array and bit operations. The mask calculation shifts a literal 1 of type int left by anything between 0 and 31. UndefinedBehaviorSanitizer doesn't like that and reports: object-file.c:2477:18: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' Make sure to use an unsigned 1 instead to avoid the issue. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2021, 17:19:56 UTC |
| e83b124 | Daniel Santos | 11 August 2021, 04:07:01 UTC | l10n: pt_PT: cleaning flags mismatch * corrected git flags mismatch Signed-off-by: Daniel Santos <hello@brighterdan.com> | 11 August 2021, 04:07:01 UTC |
| db0aa64 | Daniel Santos | 09 August 2021, 07:33:41 UTC | l10n: pt_PT: cleaning duplicate translations * cleaning duplicate incorrect translations part 1 Signed-off-by: Daniel Santos <hello@brighterdan.com> | 10 August 2021, 18:32:01 UTC |
| ffbb3ee | Daniel Santos | 06 August 2021, 14:20:28 UTC | l10n: pt_PT: update translation tables * update translation tables Signed-off-by: Daniel Santos <hello@brighterdan.com> | 10 August 2021, 18:32:01 UTC |
| d0c637e | Daniel Santos | 03 August 2021, 13:50:58 UTC | l10n: pt_PT: translated git v2.33.0 * translated new entries of git v2.33.0 Signed-off-by: Daniel Santos <hello@brighterdan.com> | 10 August 2021, 18:31:49 UTC |
| 6a38e33 | Jonathan Nieder | 06 August 2021, 01:45:23 UTC | Revert 'diff-merges: let "-m" imply "-p"' This reverts commit f5bfcc823ba242a46e20fb6f71c9fbf7ebb222fe, which made "git log -m" imply "--patch" by default. The logic was that "-m", which makes diff generation for merges perform a diff against each parent, has no use unless I am viewing the diff, so we could save the user some typing by turning on display of the resulting diff automatically. That wasn't expected to adversely affect scripts because scripts would either be using a command like "git diff-tree" that already emits diffs by default or would be combining -m with a diff generation option such as --name-status. By saving typing for interactive use without adversely affecting scripts in the wild, it would be a pure improvement. The problem is that although diff generation options are only relevant for the displayed diff, a script author can imagine them affecting path limiting. For example, I might run git log -w --format=%H -- README hoping to list commits that edited README, excluding whitespace-only changes. In fact, a whitespace-only change is not TREESAME so the use of -w here has no effect (since we don't apply these diff generation flags to the diff_options struct rev_info::pruning used for this purpose), but the documentation suggests that it should work Suppose you specified foo as the <paths>. We shall call commits that modify foo !TREESAME, and the rest TREESAME. (In a diff filtered for foo, they look different and equal, respectively.) and a script author who has not tested whitespace-only changes wouldn't notice. Similarly, a script author could include git log -m --first-parent --format=%H -- README to filter the first-parent history for commits that modified README. The -m is a no-op but it reflects the script author's intent. For example, until 1e20a407fe2 (stash list: stop passing "-m" to "git log", 2021-05-21), "git stash list" did this. As a result, we can't safely change "-m" to imply "-p" without fear of breaking such scripts. Restore the previous behavior. Noticed because Rust's src/bootstrap/bootstrap.py made use of this same construct: https://github.com/rust-lang/rust/pull/87513. That script has been updated to omit the unnecessary "-m" option, but we can expect other scripts in the wild to have similar expectations. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2021, 20:52:01 UTC |
| 9d66d5e | Peter Krefting | 09 August 2021, 19:38:56 UTC | l10n: sv.po: Update Swedish translation (5227t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 August 2021, 19:38:56 UTC |
| dd3c8a7 | Carlo Marcelo Arenas Belón | 09 August 2021, 01:38:32 UTC | object-store: avoid extra ';' from KHASH_INIT cf2dc1c238 (speed up alt_odb_usable() with many alternates, 2021-07-07) introduces a KHASH_INIT invocation with a trailing ';', which while commonly expected will trigger warnings with pedantic on both clang[-Wextra-semi] and gcc[-Wpedantic], because that macro has already a semicolon and is meant to be invoked without one. while fixing the macro would be a worthy solution (specially considering this is a common recurring problem), remove the extra ';' for now to minimize churn. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2021, 16:01:30 UTC |
| 1482594 | Carlo Marcelo Arenas Belón | 09 August 2021, 01:38:31 UTC | oidtree: avoid nested struct oidtree_node 92d8ed8ac1 (oidtree: a crit-bit tree for odb_loose_cache, 2021-07-07) adds a struct oidtree_node that contains only an n field with a struct cb_node. unfortunately, while building in pedantic mode witch clang 12 (as well as a similar error from gcc 11) it will show: oidtree.c:11:17: error: 'n' may not be nested in a struct due to flexible array member [-Werror,-Wflexible-array-extensions] struct cb_node n; ^ because of a constrain coded in ISO C 11 6.7.2.1¶3 that forbids using structs that contain a flexible array as part of another struct. use a strict cb_node directly instead. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2021, 16:01:30 UTC |
| e84f865 | Tran Ngoc Quan | 09 August 2021, 00:58:57 UTC | l10n: vi.po(5227t): Updated Vietnamese translation for v2.32.0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 09 August 2021, 00:58:57 UTC |
| 2d755df | Junio C Hamano | 06 August 2021, 19:53:06 UTC | Git 2.33-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2021, 19:53:06 UTC |
| aa7d2fe | Junio C Hamano | 06 August 2021, 19:52:22 UTC | Merge branch 'cb/t7508-regexp-fix' * cb/t7508-regexp-fix: t7508: avoid non POSIX BRE | 06 August 2021, 19:52:22 UTC |
| 5519492 | Junio C Hamano | 06 August 2021, 19:52:15 UTC | Merge branch 'ab/pickaxe-pcre2' * ab/pickaxe-pcre2: diff: --pickaxe-all typofix | 06 August 2021, 19:52:15 UTC |
| c87977a | Junio C Hamano | 06 August 2021, 19:50:26 UTC | Merge branch 'fc/disable-checkwinsize' * fc/disable-checkwinsize: test: fix for COLUMNS and bash 5 | 06 August 2021, 19:50:26 UTC |
| 390b44e | Felipe Contreras | 05 August 2021, 19:48:25 UTC | test: fix for COLUMNS and bash 5 Since c49a177bec (test-lib.sh: set COLUMNS=80 for --verbose repeatability, 2021-06-29) multiple tests have been failing when using bash 5 because checkwinsize is enabled by default, therefore COLUMNS is reset using TIOCGWINSZ even for non-interactive shells. It's debatable whether or not bash should even be doing that, but for now we can avoid this undesirable behavior by disabling this option. Reported-by: Fabian Stelzer <fabian.stelzer@campoint.net> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> [jc: with SZEDER Gábor's suggestion to do this before setting COLUMNS] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2021, 16:59:55 UTC |
| 12515dc | Alexander Shopov | 06 August 2021, 09:57:40 UTC | l10n: bg.po: Updated Bulgarian translation (5227t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 06 August 2021, 10:40:56 UTC |
| 5fee9b9 | Jiang Xin | 06 August 2021, 00:00:45 UTC | Merge branch 'po-id' of github.com:bagasme/git-po * 'po-id' of github.com:bagasme/git-po: l10n: id: po-id for 2.33.0 (round 1) | 06 August 2021, 00:00:45 UTC |
| 0175886 | Daniel Santos | 03 August 2021, 12:30:05 UTC | l10n: pt_PT: update git-po-helper Signed-off-by: Daniel Santos <hello@brighterdan.com> | 05 August 2021, 13:05:11 UTC |
| cece123 | Daniel Santos | 02 August 2021, 13:41:11 UTC | l10n: pt_PT: remove trailing comments * removed all unecessary trailing file comments Signed-off-by: Daniel Santos <hello@brighterdan.com> | 05 August 2021, 13:05:11 UTC |
| 2a68d66 | Daniel Santos | 24 July 2021, 12:46:59 UTC | l10n: pt_PT: translation tables * filled translation table * add other translation table helper Signed-off-by: Daniel Santos <hello@brighterdan.com> | 05 August 2021, 13:05:04 UTC |
| 310dc40 | Bagas Sanjaya | 04 August 2021, 10:24:39 UTC | l10n: id: po-id for 2.33.0 (round 1) Translate following new components: * builtin/show-branch.c * builtin/show-index.c * builtin/show-ref.c * builtin/shortlog.c * builtin/describe.c * bisect.c * builtin/bisect--helper.c * blame.c * builtin/blame.c * grep.c * builtin/grep.c * builtin/diff-tree.c * builtin/diff.c * help.c Update translation for following components: * diff.c * builtin/clone.c * builtin/fetch.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> | 05 August 2021, 11:08:57 UTC |
| fac4cae | Jiang Xin | 05 August 2021, 04:56:29 UTC | Merge branch 'tr-loc-v2.33' of github.com:bitigchi/git-po * 'tr-loc-v2.33' of github.com:bitigchi/git-po: l10n: tr: v2.33.0 round 1 | 05 August 2021, 04:56:29 UTC |
| 87c67ef | Emir Sarı | 03 August 2021, 11:13:08 UTC | l10n: tr: v2.33.0 round 1 Signed-off-by: Emir Sarı <bitigchi@me.com> | 05 August 2021, 04:45:52 UTC |
| 518bb51 | Jiang Xin | 05 August 2021, 00:36:31 UTC | Merge branch 'fr_v2.33_rnd1' of github.com:jnavila/git * 'fr_v2.33_rnd1' of github.com:jnavila/git: l10n: fr.po v2.33 rnd 1 l10n: fr: fix typo | 05 August 2021, 00:36:31 UTC |
| e5a14dd | Junio C Hamano | 04 August 2021, 20:09:13 UTC | The eighth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2021, 20:28:56 UTC |
| 099a64a | Junio C Hamano | 04 August 2021, 20:28:56 UTC | Merge branch 'tb/mingw-rmdir-symlink-to-directory' Windows rmdir() equivalent behaves differently from POSIX ones in that when used on a symbolic link that points at a directory, the target directory gets removed, which has been corrected. * tb/mingw-rmdir-symlink-to-directory: mingw: align symlinks-related rmdir() behavior with Linux | 04 August 2021, 20:28:56 UTC |
| dfbbe8b | Junio C Hamano | 04 August 2021, 20:28:55 UTC | Merge branch 'ar/doc-markup-fix' Doc mark-up fix. * ar/doc-markup-fix: Documentation: render special characters correctly | 04 August 2021, 20:28:55 UTC |
| fea3738 | Junio C Hamano | 04 August 2021, 20:28:55 UTC | Merge branch 'ab/getcwd-test' Portability test update. * ab/getcwd-test: t0001: fix broken not-quite getcwd(3) test in bed67874e2 | 04 August 2021, 20:28:55 UTC |
| 4dc9646 | Junio C Hamano | 04 August 2021, 20:28:54 UTC | Merge branch 'rs/use-fspathhash' Code simplification. * rs/use-fspathhash: use fspathhash() everywhere | 04 August 2021, 20:28:54 UTC |
| 5fef3b1 | Junio C Hamano | 04 August 2021, 20:28:54 UTC | Merge branch 'pb/merge-autostash-more' The local changes stashed by "git merge --autostash" were lost when the merge failed in certain ways, which has been corrected. * pb/merge-autostash-more: merge: apply autostash if merge strategy fails merge: apply autostash if fast-forward fails Documentation: define 'MERGE_AUTOSTASH' merge: add missing word "strategy" to a message | 04 August 2021, 20:28:54 UTC |
| 1a6fb01 | Junio C Hamano | 04 August 2021, 20:28:54 UTC | Merge branch 'en/ort-perf-batch-14' Further optimization on "merge -sort" backend. * en/ort-perf-batch-14: merge-ort: restart merge with cached renames to reduce process entry cost merge-ort: avoid recursing into directories when we don't need to merge-ort: defer recursing into directories when merge base is matched merge-ort: add a handle_deferred_entries() helper function merge-ort: add data structures for allowable trivial directory resolves merge-ort: add some more explanations in collect_merge_info_callback() merge-ort: resolve paths early when we have sufficient information | 04 August 2021, 20:28:54 UTC |
| 506d2a3 | Junio C Hamano | 04 August 2021, 20:28:53 UTC | Merge branch 'ds/commit-and-checkout-with-sparse-index' "git checkout" and "git commit" learn to work without unnecessarily expanding sparse indexes. * ds/commit-and-checkout-with-sparse-index: unpack-trees: resolve sparse-directory/file conflicts t1092: document bad 'git checkout' behavior checkout: stop expanding sparse indexes sparse-index: recompute cache-tree commit: integrate with sparse-index p2000: compress repo names p2000: add 'git checkout -' test and decrease depth | 04 August 2021, 20:28:53 UTC |
| 58705b4 | Junio C Hamano | 04 August 2021, 20:28:53 UTC | Merge branch 'ab/update-submitting-patches' Reorganize and update the SubmitingPatches document. * ab/update-submitting-patches: SubmittingPatches: replace discussion of Travis with GitHub Actions SubmittingPatches: move discussion of Signed-off-by above "send" | 04 August 2021, 20:28:53 UTC |
| 31f9acf | Junio C Hamano | 04 August 2021, 20:28:52 UTC | Merge branch 'ah/plugleaks' Leak plugging. * ah/plugleaks: reset: clear_unpack_trees_porcelain to plug leak builtin/rebase: fix options.strategy memory lifecycle builtin/merge: free found_ref when done builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv convert: release strbuf to avoid leak read-cache: call diff_setup_done to avoid leak ref-filter: also free head for ATOM_HEAD to avoid leak diffcore-rename: move old_dir/new_dir definition to plug leak builtin/for-each-repo: remove unnecessary argv copy to plug leak builtin/submodule--helper: release unused strbuf to avoid leak environment: move strbuf into block to plug leak fmt-merge-msg: free newly allocated temporary strings when done | 04 August 2021, 20:28:52 UTC |
| 10f57e0 | Junio C Hamano | 04 August 2021, 20:28:52 UTC | Merge branch 'ar/submodule-add' Rewrite of "git submodule" in C continues. * ar/submodule-add: submodule: drop unused sm_name parameter from show_fetch_remotes() submodule--helper: introduce add-clone subcommand submodule--helper: refactor module_clone() submodule: prefix die messages with 'fatal' t7400: test failure to add submodule in tracked path | 04 August 2021, 20:28:52 UTC |
| 11c649b | Bagas Sanjaya | 04 August 2021, 12:24:20 UTC | diff: --pickaxe-all typofix When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round, I noticed a triple-dash typo (--pickaxe-all) at diff.c, which according to git-diff(1) manpage, the correct option name should be --pickaxe-all. Fix the typo. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2021, 17:34:47 UTC |
| c131aab | Jean-Noël Avila | 03 August 2021, 20:13:07 UTC | l10n: fr.po v2.33 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 03 August 2021, 20:13:07 UTC |
| 98bdfc0 | Jean-Noël Avila | 19 June 2021, 11:40:34 UTC | l10n: fr: fix typo Reported-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 03 August 2021, 19:06:47 UTC |
| 8d2cca9 | Daniel Santos | 23 July 2021, 15:57:22 UTC | l10n: pt_PT: add Portuguese translations part 5 * git-po-helper update Signed-off-by: Daniel Santos <hello@brighterdan.com> | 03 August 2021, 12:20:18 UTC |
| ea00f10 | Daniel Santos | 18 June 2021, 21:44:59 UTC | l10n: pt_PT: add Portuguese translations part 4 * Fixed some typos * Transformed 'não' (no) into affirmative * Substituted 'excerto' to 'pedaço' Signed-off-by: Daniel Santos <hello@brighterdan.com> | 03 August 2021, 12:20:15 UTC |
| 4ef987f | Jordi Mas | 03 August 2021, 10:50:24 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 03 August 2021, 10:50:24 UTC |
| d4df71b | Jiang Xin | 03 August 2021, 09:06:56 UTC | l10n: git.pot: v2.33.0 round 1 (38 new, 15 removed) Generate po/git.pot from v2.33.0-rc0 for git v2.33.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 August 2021, 09:06:56 UTC |
| 972c9cf | Jiang Xin | 03 August 2021, 09:03:35 UTC | Merge branch 'master' of github.com:git/git * 'master' of github.com:git/git: (397 commits) Git 2.33-rc0 The seventh batch ci/install-dependencies: handle "sparse" job package installs ci: run "apt-get update" before "apt-get install" cache-tree: prefetch in partial clone read-tree unpack-trees: refactor prefetching code pack-bitmap: check pack validity when opening bitmap bundle tests: use test_cmp instead of grep bundle tests: use ">file" not ": >file" The sixth batch doc: pull: fix rebase=false documentation pack-bitmap: clarify comment in filter_bitmap_exclude_type() doc: clarify description of 'submodule.recurse' doc/git-config: simplify "override" advice for FILES section doc/git-config: clarify GIT_CONFIG environment variable doc/git-config: explain --file instead of referring to GIT_CONFIG t0000: fix test if run with TEST_OUTPUT_DIRECTORY multi-pack-index: fix potential segfault without sub-command refs/debug: quote prefix t0000: clear GIT_SKIP_TESTS before running sub-tests ... | 03 August 2021, 09:03:35 UTC |
| 3e7d488 | Thomas Bétous | 02 August 2021, 21:07:30 UTC | mingw: align symlinks-related rmdir() behavior with Linux When performing a rebase, rmdir() is called on the folder .git/logs. On Unix rmdir() exits without deleting anything in case .git/logs is a symbolic link but the equivalent functions on Windows (_rmdir, _wrmdir and RemoveDirectoryW) do not behave the same and remove the folder if it is symlinked even if it is not empty. This creates issues when folders in .git/ are symlinks which is especially the case when git-repo[1] is used: It replaces `.git/logs/` with a symlink. One such issue is that the _target_ of that symlink is removed e.g. during a `git rebase`, where `delete_reflog("REBASE_HEAD")` will not only try to remove `.git/logs/REBASE_HEAD` but then recursively try to remove the parent directories until an error occurs, a technique that obviously relies on `rmdir()` refusing to remove a symlink. This was reported in https://github.com/git-for-windows/git/issues/2967. This commit updates mingw_rmdir() so that its behavior is the same as Linux rmdir() in case of symbolic links. To verify that Git does not regress on the reported issue, this patch adds a regression test for the `git rebase` symptom, even if the same `rmdir()` behavior is quite likely to cause potential problems in other Git commands as well. [1]: git-repo is a python tool built on top of Git which helps manage many Git repositories. It stores all the .git/ folders in a central place by taking advantage of symbolic links. More information: https://gerrit.googlesource.com/git-repo/ Signed-off-by: Thomas Bétous <tomspycell@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2021, 22:10:58 UTC |
| 4da8b2f | Carlo Marcelo Arenas Belón | 01 August 2021, 21:53:00 UTC | t7508: avoid non POSIX BRE 24c30e0b6 (wt-status: tolerate dangling marks, 2020-09-01) adds a test that uses a BRE which breaks at least with OpenBSD's grep. switch to an ERE as it is done for similar checks and while at it, remove the now obsolete test_i18ngrep call. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2021, 22:05:23 UTC |
| 6626245 | Junio C Hamano | 30 July 2021, 23:14:07 UTC | Git 2.33-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2021, 21:06:43 UTC |
| 9bcdaab | Junio C Hamano | 02 August 2021, 21:06:43 UTC | Merge branch 'jk/check-pack-valid-before-opening-bitmap' A race between repacking and using pack bitmaps has been corrected. * jk/check-pack-valid-before-opening-bitmap: pack-bitmap: check pack validity when opening bitmap | 02 August 2021, 21:06:43 UTC |
| 8230107 | Junio C Hamano | 02 August 2021, 21:06:42 UTC | Merge branch 'jt/bulk-prefetch' "git read-tree" had a codepath where blobs are fetched one-by-one from the promisor remote, which has been corrected to fetch in bulk. * jt/bulk-prefetch: cache-tree: prefetch in partial clone read-tree unpack-trees: refactor prefetching code | 02 August 2021, 21:06:42 UTC |
| e9fe413 | Junio C Hamano | 02 August 2021, 21:06:42 UTC | Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours' Documentation fix for "git pull --rebase=no". * fc/pull-no-rebase-merges-theirs-into-ours: doc: pull: fix rebase=false documentation | 02 August 2021, 21:06:42 UTC |
| 107687b | Junio C Hamano | 02 August 2021, 21:06:41 UTC | Merge branch 'ab/bundle-tests' "git bundle" gained more test coverage. * ab/bundle-tests: bundle tests: use test_cmp instead of grep bundle tests: use ">file" not ": >file" | 02 August 2021, 21:06:41 UTC |
| e163f73 | Junio C Hamano | 02 August 2021, 21:06:41 UTC | Merge branch 'ps/perf-with-separate-output-directory' Test update. * ps/perf-with-separate-output-directory: perf: fix when running with TEST_OUTPUT_DIRECTORY | 02 August 2021, 21:06:41 UTC |
| 8a49dfa | Junio C Hamano | 02 August 2021, 21:06:40 UTC | Merge branch 'js/ci-check-whitespace-updates' CI update. * js/ci-check-whitespace-updates: ci(check-whitespace): restrict to the intended commits ci(check-whitespace): stop requiring a read/write token | 02 August 2021, 21:06:40 UTC |
| 5a9b455 | Junio C Hamano | 02 August 2021, 21:06:39 UTC | Merge branch 'jk/config-env-doc' Documentation around GIT_CONFIG has been updated. * jk/config-env-doc: doc/git-config: simplify "override" advice for FILES section doc/git-config: clarify GIT_CONFIG environment variable doc/git-config: explain --file instead of referring to GIT_CONFIG | 02 August 2021, 21:06:40 UTC |
| c018818 | Junio C Hamano | 02 August 2021, 21:06:39 UTC | Merge branch 'pb/submodule-recurse-doc' Doc update. * pb/submodule-recurse-doc: doc: clarify description of 'submodule.recurse' | 02 August 2021, 21:06:39 UTC |
| 9556aad | Junio C Hamano | 02 August 2021, 21:06:38 UTC | Merge branch 'tb/bitmap-type-filter-comment-fix' In-code comment update. * tb/bitmap-type-filter-comment-fix: pack-bitmap: clarify comment in filter_bitmap_exclude_type() | 02 August 2021, 21:06:38 UTC |
| 7431842 | René Scharfe | 30 July 2021, 19:06:58 UTC | use fspathhash() everywhere cf2dc1c238 (speed up alt_odb_usable() with many alternates, 2021-07-07) introduced the function fspathhash() for calculating path hashes while respecting the configuration option core.ignorecase. Call it instead of open-coding it; the resulting code is shorter and less repetitive. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2021, 19:14:27 UTC |
