aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c (unfollow)
AgeCommit message (Collapse)AuthorFilesLines
2021-08-16Git 2.33v2.33.0Junio C Hamano2-5/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-16l10n: sv.po: Update Swedish translation (5230t0f0u)Peter Krefting1-508/+530
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>
2021-08-16l10n: TEAMS: change Simplified Chinese team leaderJiang Xin1-3/+3
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2021-08-15oidtree: avoid unaligned access to crit-bit treeRené Scharfe3-7/+17
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>
2021-08-15l10n: tr: v2.33 (round 2)Emir Sarı1-514/+538
Signed-off-by: Emir Sarı <bitigchi@me.com>
2021-08-14l10n: es: 2.33.0 round 2Christopher Diaz Riveros1-4302/+3504
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>
2021-08-15l10n: zh_CN: for git v2.33.0 l10n round 2Jiang Xin1-2202/+2345
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>
2021-08-15l10n: zh_CN: Revision for git v2.32.0 l10n round 1Fangyi Zhou1-4/+4
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2021-08-15l10n: README: refactor to use GFM syntaxJiang Xin1-172/+223
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>
2021-08-14l10n: update German translation for Git v2.33.0 (rnd2)Ralf Thielow1-501/+522
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2021-08-14l10n: pt_PT: v2.33.0 round 2Daniel Santos1-26/+25
* translation of new entries Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-14l10n: pt_PT: git-po-helper updateDaniel Santos1-741/+617
* run git-po-helper update pt_PT.po Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-14l10n: pt_PT: update translation tableDaniel Santos1-11/+63
* updated translation table Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-14l10n: zh_TW.po: remove the obsolete glossaryYi-Jyun Pan1-275/+3
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2021-08-14l10n: vi.po(5230t): Updated translation for v2.32.0 round 2Tran Ngoc Quan1-497/+517
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-08-14l10n: fr.po v2.33 rnd 2Jean-Noël Avila1-507/+543
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-08-14l10n: id: po-id for 2.33.0 round 2Bagas Sanjaya1-531/+569
Update translation for following component: * builtin/submodule--helper.c Translate following new component: * builtin/revert.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2021-08-14l10n: zh_TW.po: update for v2.33.0 rnd 2Yi-Jyun Pan1-2341/+2478
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2021-08-14l10n: git.pot: v2.33.0 round 2 (11 new, 8 removed)Jiang Xin1-484/+504
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>
2021-08-13l10n: de.po: fix typosRalf Thielow1-19/+19
Fix some typos found by `./git-po-helper check-po po/de.po`. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2021-08-13l10n: update German translation for Git v2.33.0Ralf Thielow1-1957/+2078
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2021-08-12l10n: fr.po fix typos in commands and variablesJean-Noël Avila1-104/+25
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-08-12l10n: id: mismatch variable name fixesBagas Sanjaya1-5/+5
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>
2021-08-12l10n: vi.po(5227t): Fixed typo after run git-po-helperTran Ngoc Quan1-15/+17
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-08-12l10n: Update Catalan translationJordi Mas1-101/+83
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2021-08-11Git 2.33-rc2v2.33.0-rc2Junio C Hamano2-13/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-11object-file: use unsigned arithmetic with bit maskRené Scharfe1-1/+1
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>
2021-08-11l10n: pt_PT: cleaning flags mismatchDaniel Santos1-6/+6
* corrected git flags mismatch Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-10l10n: pt_PT: cleaning duplicate translationsDaniel Santos1-426/+426
* cleaning duplicate incorrect translations part 1 Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-10l10n: pt_PT: update translation tablesDaniel Santos1-12/+14
* update translation tables Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-10l10n: pt_PT: translated git v2.33.0Daniel Santos1-49/+38
* translated new entries of git v2.33.0 Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder3-7/+6
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>
2021-08-09l10n: sv.po: Update Swedish translation (5227t0f0u)Peter Krefting1-1970/+2100
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2021-08-09object-store: avoid extra ';' from KHASH_INITCarlo Marcelo Arenas Belón1-1/+1
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>
2021-08-09oidtree: avoid nested struct oidtree_nodeCarlo Marcelo Arenas Belón1-8/+3
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>
2021-08-09l10n: vi.po(5227t): Updated Vietnamese translation for v2.32.0Tran Ngoc Quan1-1963/+2089
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2021-08-06Git 2.33-rc1v2.33.0-rc1Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-06test: fix for COLUMNS and bash 5Felipe Contreras1-0/+6
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>
2021-08-06l10n: bg.po: Updated Bulgarian translation (5227t)Alexander Shopov1-1953/+2075
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2021-08-05l10n: pt_PT: update git-po-helperDaniel Santos1-1947/+2090
Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-05l10n: pt_PT: remove trailing commentsDaniel Santos1-974/+0
* removed all unecessary trailing file comments Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-05l10n: pt_PT: translation tablesDaniel Santos1-82/+109
* filled translation table * add other translation table helper Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-05l10n: id: po-id for 2.33.0 (round 1)Bagas Sanjaya1-2250/+2434
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>
2021-08-05l10n: tr: v2.33.0 round 1Emir Sarı1-1967/+2105
Signed-off-by: Emir Sarı <bitigchi@me.com>
2021-08-04The eighth batchJunio C Hamano1-1/+16
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-04diff: --pickaxe-all typofixBagas Sanjaya1-1/+1
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>
2021-08-03l10n: fr.po v2.33 rnd 1Jean-Noël Avila1-2870/+4464
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-08-03l10n: fr: fix typoJean-Noël Avila1-2/+2
Reported-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2021-08-03l10n: pt_PT: add Portuguese translations part 5Daniel Santos1-4296/+5282
* git-po-helper update Signed-off-by: Daniel Santos <hello@brighterdan.com>
2021-08-03l10n: pt_PT: add Portuguese translations part 4Daniel Santos1-1073/+1011
* Fixed some typos * Transformed 'não' (no) into affirmative * Substituted 'excerto' to 'pedaço' Signed-off-by: Daniel Santos <hello@brighterdan.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 14:48:14 +0000