| 6ff7f46 | Johannes Schindelin | 12 February 2021, 14:50:05 UTC | Git 2.27.1 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:50:05 UTC |
| 2d1142a | Johannes Schindelin | 12 February 2021, 14:50:04 UTC | Sync with 2.26.3 * maint-2.26: Git 2.26.3 Git 2.25.5 Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:50:04 UTC |
| a79fd20 | Johannes Schindelin | 12 February 2021, 14:50:00 UTC | Git 2.26.3 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:50:00 UTC |
| 8f80393 | Johannes Schindelin | 12 February 2021, 14:49:59 UTC | Sync with 2.25.5 * maint-2.25: Git 2.25.5 Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:59 UTC |
| 42ce4c7 | Johannes Schindelin | 12 February 2021, 14:49:55 UTC | Git 2.25.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:55 UTC |
| 97d1dcb | Johannes Schindelin | 12 February 2021, 14:49:55 UTC | Sync with 2.24.4 * maint-2.24: Git 2.24.4 Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:55 UTC |
| 06214d1 | Johannes Schindelin | 12 February 2021, 14:49:50 UTC | Git 2.24.4 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:50 UTC |
| 92ac04b | Johannes Schindelin | 12 February 2021, 14:49:50 UTC | Sync with 2.23.4 * maint-2.23: Git 2.23.4 Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:50 UTC |
| d60b6a9 | Johannes Schindelin | 12 February 2021, 14:49:46 UTC | Git 2.23.4 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:46 UTC |
| 4bd06fd | Johannes Schindelin | 12 February 2021, 14:49:45 UTC | Sync with 2.22.5 * maint-2.22: Git 2.22.5 Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:45 UTC |
| c753e2a | Johannes Schindelin | 12 February 2021, 14:49:41 UTC | Git 2.22.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:41 UTC |
| bcf08f3 | Johannes Schindelin | 12 February 2021, 14:49:41 UTC | Sync with 2.21.4 * maint-2.21: Git 2.21.4 Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:41 UTC |
| c735d74 | Johannes Schindelin | 12 February 2021, 14:49:36 UTC | Git 2.21.4 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:36 UTC |
| b1726b1 | Johannes Schindelin | 12 February 2021, 14:49:35 UTC | Sync with 2.20.5 * maint-2.20: Git 2.20.5 Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:35 UTC |
| 8b1a5f3 | Johannes Schindelin | 12 February 2021, 14:49:17 UTC | Git 2.20.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:49:17 UTC |
| 8049638 | Johannes Schindelin | 12 February 2021, 14:49:17 UTC | Sync with 2.19.6 * maint-2.19: Git 2.19.6 Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:49:17 UTC |
| 9fb2a1f | Johannes Schindelin | 12 February 2021, 14:47:48 UTC | Git 2.19.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:47:48 UTC |
| fb049fd | Johannes Schindelin | 12 February 2021, 14:47:47 UTC | Sync with 2.18.5 * maint-2.18: Git 2.18.5 Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:47:47 UTC |
| 6eed462 | Johannes Schindelin | 12 February 2021, 14:47:43 UTC | Git 2.18.5 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:47:43 UTC |
| 9b77cec | Johannes Schindelin | 12 February 2021, 14:47:42 UTC | Sync with 2.17.6 * maint-2.17: Git 2.17.6 unpack_trees(): start with a fresh lstat cache run-command: invalidate lstat cache after a command finished checkout: fix bug that makes checkout follow symlinks in leading path | 12 February 2021, 14:47:42 UTC |
| 6b82d3e | Johannes Schindelin | 29 January 2021, 18:13:11 UTC | Git 2.17.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:47:02 UTC |
| 22539ec | Matheus Tavares | 02 February 2021, 21:37:10 UTC | unpack_trees(): start with a fresh lstat cache We really want to avoid relying on stale information. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:47:02 UTC |
| 0d58fef | Johannes Schindelin | 02 February 2021, 21:09:52 UTC | run-command: invalidate lstat cache after a command finished In the previous commit, we intercepted calls to `rmdir()` to invalidate the lstat cache in the successful case, so that the lstat cache could not have the idea that a directory exists where there is none. The same situation can arise, of course, when a separate process is spawned (most notably, this is the case in `submodule_move_head()`). Obviously, we cannot know whether a directory was removed in that process, therefore we must invalidate the lstat cache afterwards. Note: in contrast to `lstat_cache_aware_rmdir()`, we invalidate the lstat cache even in case of an error: the process might have removed a directory and still have failed afterwards. Co-authored-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | 12 February 2021, 14:47:02 UTC |
| 684dd4c | Matheus Tavares | 10 December 2020, 13:27:55 UTC | checkout: fix bug that makes checkout follow symlinks in leading path Before checking out a file, we have to confirm that all of its leading components are real existing directories. And to reduce the number of lstat() calls in this process, we cache the last leading path known to contain only directories. However, when a path collision occurs (e.g. when checking out case-sensitive files in case-insensitive file systems), a cached path might have its file type changed on disk, leaving the cache on an invalid state. Normally, this doesn't bring any bad consequences as we usually check out files in index order, and therefore, by the time the cached path becomes outdated, we no longer need it anyway (because all files in that directory would have already been written). But, there are some users of the checkout machinery that do not always follow the index order. In particular: checkout-index writes the paths in the same order that they appear on the CLI (or stdin); and the delayed checkout feature -- used when a long-running filter process replies with "status=delayed" -- postpones the checkout of some entries, thus modifying the checkout order. When we have to check out an out-of-order entry and the lstat() cache is invalid (due to a previous path collision), checkout_entry() may end up using the invalid data and thrusting that the leading components are real directories when, in reality, they are not. In the best case scenario, where the directory was replaced by a regular file, the user will get an error: "fatal: unable to create file 'foo/bar': Not a directory". But if the directory was replaced by a symlink, checkout could actually end up following the symlink and writing the file at a wrong place, even outside the repository. Since delayed checkout is affected by this bug, it could be used by an attacker to write arbitrary files during the clone of a maliciously crafted repository. Some candidate solutions considered were to disable the lstat() cache during unordered checkouts or sort the entries before passing them to the checkout machinery. But both ideas include some performance penalty and they don't future-proof the code against new unordered use cases. Instead, we now manually reset the lstat cache whenever we successfully remove a directory. Note: We are not even checking whether the directory was the same as the lstat cache points to because we might face a scenario where the paths refer to the same location but differ due to case folding, precomposed UTF-8 issues, or the presence of `..` components in the path. Two regression tests, with case-collisions and utf8-collisions, are also added for both checkout-index and delayed checkout. Note: to make the previously mentioned clone attack unfeasible, it would be sufficient to reset the lstat cache only after the remove_subtree() call inside checkout_entry(). This is the place where we would remove a directory whose path collides with the path of another entry that we are currently trying to check out (possibly a symlink). However, in the interest of a thorough fix that does not leave Git open to similar-but-not-identical attack vectors, we decided to intercept all `rmdir()` calls in one fell swoop. This addresses CVE-2021-21300. Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> | 12 February 2021, 14:47:02 UTC |
| b3d7a52 | Junio C Hamano | 01 June 2020, 06:03:57 UTC | Git 2.27 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2020, 06:03:57 UTC |
| 56219ba | Junio C Hamano | 31 May 2020, 18:38:44 UTC | Merge branch 'cb/test-use-ere-for-alternation' Portability fix for tests added recently. * cb/test-use-ere-for-alternation: t: avoid alternation (not POSIX) in grep's BRE | 31 May 2020, 18:38:44 UTC |
| 68f30e2 | Junio C Hamano | 31 May 2020, 18:14:07 UTC | Merge tag 'l10n-2.27.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.27.0-rnd2 * tag 'l10n-2.27.0-rnd2' of git://github.com/git-l10n/git-po: (23 commits) l10n: zh_TW.po: v2.27.0 round 2 (0 untranslated) l10n: zh_TW.po: v2.27.0 round 1 (0 untranslated) l10n: de.po: Fix typo in the German translation of octopus l10n: de.po: Update German translation for Git 2.27.0 l10n: it.po: update for Git 2.27.0 round #2 l10n: tr: v2.27.0 round 2 l10n: fr.po v2.27.0 rnd 2 l10n: bg.po: Updated Bulgarian translation (4875t) l10n: Update Catalan translation l10n: sv.po: Update Swedish translation (4875t0f0u) l10n: vi(4875t): Updated Vietnamses translation for 2.27.0rd2 l10n: zh_CN: for git v2.27.0 l10n round 1~2 l10n: git.pot: v2.27.0 round 2 (+1) l10n: Update Catalan translation l10n: vi(4874t): Updated Vietnamses translation for 2.27.0 l10n: es: 2.27.0 round 1 l10n: bg.po: Updated Bulgarian translation (4868t) l10n: fr v2.27.0 rnd 1 l10n: sv.po: Update Swedish translation (4839t0f0u) l10n: tr: v2.27.0 round 1 ... | 31 May 2020, 18:14:07 UTC |
| cb26198 | Jiang Xin | 30 May 2020, 03:26:53 UTC | Merge branch 'master' of github.com:ruester/git-po-de * 'master' of github.com:ruester/git-po-de: l10n: de.po: Fix typo in the German translation of octopus l10n: de.po: Update German translation for Git 2.27.0 | 30 May 2020, 03:26:53 UTC |
| e228b2c | Jiang Xin | 30 May 2020, 03:25:17 UTC | Merge branch of github.com:AlessandroMenti/git-po * 'update-italian-translation' of github.com:AlessandroMenti/git-po: l10n: it.po: update for Git 2.27.0 round #2 | 30 May 2020, 03:25:17 UTC |
| 1aa69c7 | Junio C Hamano | 29 May 2020, 22:12:20 UTC | Merge branch 'bc/sha-256-part-1-of-4' Docfix. * bc/sha-256-part-1-of-4: Documentation: correct hash environment variable | 29 May 2020, 22:12:20 UTC |
| 2dfa5a1 | Junio C Hamano | 29 May 2020, 22:12:19 UTC | Merge branch 'ma/rev-list-options-docfix' Docfix. * ma/rev-list-options-docfix: rev-list-options.txt: start a list for `show-pulls` | 29 May 2020, 22:12:20 UTC |
| 2410991 | Junio C Hamano | 29 May 2020, 22:12:19 UTC | Merge branch 'jk/ci-only-on-selected-branches' Dev support. * jk/ci-only-on-selected-branches: ci/config: correct instruction for CI preferences | 29 May 2020, 22:12:19 UTC |
| 46022ca | Carlo Marcelo Arenas Belón | 29 May 2020, 08:20:08 UTC | t: avoid alternation (not POSIX) in grep's BRE f1e3df3169 (t: increase test coverage of signature verification output, 2020-03-04) adds GPG dependent tests to t4202 and t6200 that were found problematic with at least OpenBSD 6.7. Using an escaped '|' for alternations works only in some implementations of grep (e.g. GNU and busybox). It is not part of POSIX[1] and not supported by some BSD, macOS, and possibly other POSIX compatible implementations. Use `grep -E`, and write it using extended regular expression. [1] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03 Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2020, 22:04:03 UTC |
| 1064a30 | Yi-Jyun Pan | 29 May 2020, 16:37:53 UTC | l10n: zh_TW.po: v2.27.0 round 2 (0 untranslated) Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 29 May 2020, 16:37:53 UTC |
| 710636a | Yi-Jyun Pan | 23 May 2020, 13:26:15 UTC | l10n: zh_TW.po: v2.27.0 round 1 (0 untranslated) Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 29 May 2020, 16:34:15 UTC |
| 9d18eae | Jan Engelhardt | 31 March 2020, 20:37:26 UTC | l10n: de.po: Fix typo in the German translation of octopus Signed-off-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> | 29 May 2020, 14:47:34 UTC |
| 7045aa9 | Matthias Rüster | 24 May 2020, 11:27:46 UTC | l10n: de.po: Update German translation for Git 2.27.0 Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> | 29 May 2020, 14:46:53 UTC |
| a09c79f | Alessandro Menti | 27 May 2020, 16:22:22 UTC | l10n: it.po: update for Git 2.27.0 round #2 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 28 May 2020, 05:53:00 UTC |
| 7af3e5b | Jiang Xin | 28 May 2020, 02:46:04 UTC | Merge branch 'fr_2.27.0rnd2' of github.com:jnavila/git * 'fr_2.27.0rnd2' of github.com:jnavila/git: l10n: fr.po v2.27.0 rnd 2 | 28 May 2020, 02:46:04 UTC |
| 2c0f79c | Jiang Xin | 28 May 2020, 02:45:33 UTC | Merge branch 'master' of github.com:bitigchi/git-po * 'master' of github.com:bitigchi/git-po: l10n: tr: v2.27.0 round 2 | 28 May 2020, 02:45:33 UTC |
| ba6f6f6 | Jiang Xin | 28 May 2020, 02:45:11 UTC | Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4875t) | 28 May 2020, 02:45:11 UTC |
| b318337 | Jiang Xin | 28 May 2020, 02:44:21 UTC | Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 28 May 2020, 02:44:21 UTC |
| ed11a5a | Toon Claes | 26 May 2020, 18:37:20 UTC | Documentation: correct hash environment variable To set the default hash algorithm you can set the `GIT_DEFAULT_HASH` environment variable. In the documentation this variable is named `GIT_DEFAULT_HASH_ALGORITHM`, which is incorrect. Signed-off-by: Toon Claes <toon@iotcl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 May 2020, 17:00:05 UTC |
| 61c7f04 | Emir Sarı | 27 May 2020, 09:48:41 UTC | l10n: tr: v2.27.0 round 2 Signed-off-by: Emir Sarı <bitigchi@me.com> | 27 May 2020, 09:48:41 UTC |
| f0882a0 | Jean-Noël Avila | 27 May 2020, 09:18:48 UTC | l10n: fr.po v2.27.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 27 May 2020, 09:18:48 UTC |
| 2256311 | Alexander Shopov | 27 May 2020, 07:44:12 UTC | l10n: bg.po: Updated Bulgarian translation (4875t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 27 May 2020, 07:44:34 UTC |
| b6d7940 | Jordi Mas | 27 May 2020, 06:59:48 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 27 May 2020, 06:59:48 UTC |
| 3eff1ed | Peter Krefting | 27 May 2020, 06:41:28 UTC | l10n: sv.po: Update Swedish translation (4875t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 27 May 2020, 06:41:28 UTC |
| 4b4cf76 | Tran Ngoc Quan | 27 May 2020, 01:07:58 UTC | l10n: vi(4875t): Updated Vietnamses translation for 2.27.0rd2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 27 May 2020, 01:08:20 UTC |
| 349ede6 | Jiang Xin | 11 March 2018, 00:53:35 UTC | l10n: zh_CN: for git v2.27.0 l10n round 1~2 Translate 73 new messages (4875t0f0u) for git 2.27.0. Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 26 May 2020, 23:39:48 UTC |
| b3f6cd7 | Jiang Xin | 26 May 2020, 23:24:01 UTC | l10n: git.pot: v2.27.0 round 2 (+1) Generate po/git.pot from v2.27.0-rc2 for git v2.27.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 26 May 2020, 23:24:01 UTC |
| f670d40 | Jiang Xin | 26 May 2020, 23:22:26 UTC | Merge branch 'master' of github.com:git-l10n/git-po * 'master' of github.com:git-l10n/git-po: l10n: Update Catalan translation l10n: vi(4874t): Updated Vietnamses translation for 2.27.0 l10n: es: 2.27.0 round 1 l10n: bg.po: Updated Bulgarian translation (4868t) l10n: fr v2.27.0 rnd 1 l10n: sv.po: Update Swedish translation (4839t0f0u) l10n: tr: v2.27.0 round 1 l10n: it.po: update the Italian translation for Git 2.27.0 round 1 l10n: git.pot: v2.27.0 round 1 (72 new, 37 removed) l10n: Update Catalan translation | 26 May 2020, 23:22:26 UTC |
| 2d5e9f3 | Junio C Hamano | 26 May 2020, 16:38:13 UTC | Git 2.27-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2020, 16:38:13 UTC |
| 21a15f4 | Junio C Hamano | 26 May 2020, 16:32:08 UTC | Merge branch 'ss/faq-ignore' Doc markup fix. * ss/faq-ignore: gitfaq: avoid validation error with older asciidoc | 26 May 2020, 16:32:08 UTC |
| 32f7037 | Martin Ågren | 25 May 2020, 17:06:07 UTC | rev-list-options.txt: start a list for `show-pulls` The explanation of the `--show-pulls` option added in commit 8d049e182e ("revision: --show-pulls adds helpful merges", 2020-04-10) consists of several paragraphs and we use "+" throughout to tie them together in one long chain of list continuations. Only thing is, we're not in any kind of list, so these pluses end up being rendered literally. The preceding few paragraphs describe `--ancestry-path` and there we *do* have a list, since we've started one with `--ancestry-path::`. In fact, we have several such lists for all the various history-simplifying options we're discussing earlier in this file. Thus, we're missing a list both from a consistency point of view and from a practical rendering standpoint. Let's start a list for `--show-pulls` where we start actually discussing the option, and keep the paragraphs preceding it out of that list. That is, drop all those pluses before the new list we're adding here. Helped-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2020, 15:04:36 UTC |
| 5c752ff | Todd Zullinger | 19 May 2020, 04:53:01 UTC | gitfaq: avoid validation error with older asciidoc When building with asciidoc-8.4.5 (as found on CentOS/Red Hat 6), the period in the "[[files-in-.gitignore-are-tracked]]" anchor is not properly parsed as a section: WARNING: gitfaq.txt: line 245: missing [[files-in-.gitignore-are-tracked]] section The resulting XML file fails to validate with xmlto: xmlto: /git/Documentation/gitfaq.xml does not validate (status 3) xmlto: Fix document syntax or use --skip-validation option /git/Documentation/gitfaq.xml:3: element refentry: validity error : Element refentry content does not follow the DTD, expecting (beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link | olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ | refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1 refsect1 refsect1 refsect1 variablelist refsect1 refsect1 ) Document /git/Documentation/gitfaq.xml does not validate Let's avoid breaking users of platforms which ship an old version of asciidoc, since the cost to do so is quite low. Reported-by: Son Luong Ngoc <sluongng@gmail.com> Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2020, 18:59:26 UTC |
| d2ecc46 | Junio C Hamano | 25 May 2020, 01:13:53 UTC | Hopefully final batch before 2.27-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2020, 02:39:40 UTC |
| ea7aa4f | Junio C Hamano | 25 May 2020, 02:39:40 UTC | Merge branch 'dd/t5703-grep-a-fix' Update an unconditional use of "grep -a" with a perl script in a test. * dd/t5703-grep-a-fix: t5703: replace "grep -a" usage by perl | 25 May 2020, 02:39:40 UTC |
| d55a4ae | Junio C Hamano | 25 May 2020, 02:39:39 UTC | Merge branch 'ds/multi-pack-verify' Fix for a copy-and-paste error introduced during 2.20 era. * ds/multi-pack-verify: fsck: use ERROR_MULTI_PACK_INDEX | 25 May 2020, 02:39:39 UTC |
| 36fec2a | Junio C Hamano | 25 May 2020, 02:39:38 UTC | Merge branch 'ma/doc-fixes' Various doc fixes. * ma/doc-fixes: git-sparse-checkout.txt: add missing ' git-credential.txt: use list continuation git-commit-graph.txt: fix list rendering git-commit-graph.txt: fix grammo date-formats.txt: fix list continuation | 25 May 2020, 02:39:38 UTC |
| 666b97a | Junio C Hamano | 25 May 2020, 02:39:38 UTC | Merge branch 'cb/bisect-replay-with-dos-fix' Re-fix longstanding "edited bisect log may confuse bisect replay with trailing carriage-return" issue. * cb/bisect-replay-with-dos-fix: bisect: avoid tailing CR characters from revision in replay | 25 May 2020, 02:39:38 UTC |
| f37d959 | Junio C Hamano | 25 May 2020, 02:39:38 UTC | Merge branch 'gs/commit-graph-path-filter' Test fix. * gs/commit-graph-path-filter: t4216: avoid unnecessary subshell in test_bloom_filters_not_used | 25 May 2020, 02:39:38 UTC |
| 4cf237c | Junio C Hamano | 25 May 2020, 02:39:37 UTC | Merge branch 'dl/merge-autostash' Test fix. * dl/merge-autostash: t5520: avoid alternation in grep's BRE (not POSIX) | 25 May 2020, 02:39:37 UTC |
| 80e013c | Junio C Hamano | 25 May 2020, 02:39:36 UTC | Merge branch 'bc/faq' "git help guides" now includes the newly added FAQ document. * bc/faq: command-list.txt: add gitfaq to the list of guides | 25 May 2020, 02:39:36 UTC |
| 09dcde9 | Junio C Hamano | 25 May 2020, 02:39:35 UTC | Merge branch 'jt/avoid-prefetch-when-able-in-diff' Test-coverage enhancement. * jt/avoid-prefetch-when-able-in-diff: t4067: make rename detection test output raw diff | 25 May 2020, 02:39:36 UTC |
| df0a5e4 | Junio C Hamano | 25 May 2020, 02:39:35 UTC | Merge branch 'gp/hppa-stack-test-fix' Platform dependent tweak to a test for HP-PA. * gp/hppa-stack-test-fix: tests: skip small-stack tests on hppa architecture | 25 May 2020, 02:39:35 UTC |
| ad58801 | Jordi Mas | 22 May 2020, 05:59:22 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 22 May 2020, 05:59:22 UTC |
| ae92ac8 | Junio C Hamano | 21 May 2020, 18:15:04 UTC | Merge https://github.com/prati0100/git-gui * https://github.com/prati0100/git-gui: git-gui: Handle Ctrl + BS/Del in the commit msg Subject: git-gui: fix syntax error because of missing semicolon | 21 May 2020, 18:15:04 UTC |
| c195247 | Pratyush Yadav | 21 May 2020, 12:55:32 UTC | Merge branch 'il/ctrl-bs-del' Allow deleting words backwards and forwards using Ctrl + Backspace and Delete in the commit message buffer. * il/ctrl-bs-del: git-gui: Handle Ctrl + BS/Del in the commit msg | 21 May 2020, 12:55:32 UTC |
| e9269c0 | Tran Ngoc Quan | 21 May 2020, 01:22:14 UTC | l10n: vi(4874t): Updated Vietnamses translation for 2.27.0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 21 May 2020, 01:22:57 UTC |
| 173cb08 | Carlo Marcelo Arenas Belón | 20 May 2020, 17:08:43 UTC | bisect: avoid tailing CR characters from revision in replay 6c722cbe5a (bisect: allow CRLF line endings in "git bisect replay" input, 2020-05-07) includes CR as a field separator, but relies on it not being included in the last field, which breaks at least when running under OpenBSD 6.7's sh. Instead of just assume the CR will get swallowed, read the rest of the line into an otherwise unused variable and ignore it everywhere except on the call for git bisect start, where it matters. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2020, 17:13:19 UTC |
| 2cf579c | Philippe Blain | 20 May 2020, 14:44:48 UTC | command-list.txt: add gitfaq to the list of guides When 'gitfaq.txt' was added in 2149b6748f (docs: add a FAQ, 2020-03-30), it was added to the Makefile but not to command-list.txt. Add it there also, so that the new FAQ is listed in the output of `git help --guides`. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2020, 16:00:58 UTC |
| c703309 | Carlo Marcelo Arenas Belón | 20 May 2020, 03:44:44 UTC | t5520: avoid alternation in grep's BRE (not POSIX) Instead of using a BRE, that broke tests 30-32, 37-39, 42 at least with OpenBSD 6.7; use a simpler ERE. Fixes: d9f15d37f1 (pull: pass --autostash to merge, 2020-04-07) Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2020, 15:57:07 UTC |
| 784ce03 | Carlo Marcelo Arenas Belón | 20 May 2020, 03:44:42 UTC | t4216: avoid unnecessary subshell in test_bloom_filters_not_used Seems to trigger a bug in at least OpenBSD's 6.7 sh where it is interpreted as a history lookup and therefore fails 125-126, 128, 130. Remove the subshell and get a space between ! and grep, so tests pass successfully. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2020, 15:56:12 UTC |
| 87680d3 | Junio C Hamano | 20 May 2020, 15:33:55 UTC | Git 2.27-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2020, 15:33:55 UTC |
| 22954ba | Junio C Hamano | 20 May 2020, 15:33:29 UTC | Merge branch 'es/bugreport' Doc fix. * es/bugreport: git-bugreport.txt: adjust reference to strftime(3) | 20 May 2020, 15:33:30 UTC |
| 7c65901 | Junio C Hamano | 20 May 2020, 15:33:29 UTC | Merge branch 'ak/slab-decl-cleanup' Code clean-up. * ak/slab-decl-cleanup: commit-slab-decl.h: update include guard | 20 May 2020, 15:33:29 UTC |
| 972ce85 | Junio C Hamano | 20 May 2020, 15:33:29 UTC | Merge branch 'jc/fix-tap-output-under-bash' A recent attempt to make the test output nicer to view on CI systems broke TAP output under bash. The effort has been reverted to be re-attempted in the next cycle. * jc/fix-tap-output-under-bash: Revert "tests: when run in Bash, annotate test failures with file name/line number" Revert "ci: add a problem matcher for GitHub Actions" Revert "t/test_lib: avoid naked bash arrays in file_lineno" | 20 May 2020, 15:33:29 UTC |
| fde4622 | Junio C Hamano | 20 May 2020, 15:33:29 UTC | Merge branch 'en/sparse-checkout' Consistency fix to a topic already in 'master'. * en/sparse-checkout: unpack-trees: also allow get_progress() to work on a different index | 20 May 2020, 15:33:29 UTC |
| 85d6e28 | Junio C Hamano | 20 May 2020, 15:33:28 UTC | Merge branch 'ds/trace-log-progress-fix' Last-minute fix for our recent change to allow use of progress API as a traceable region. * ds/trace-log-progress-fix: progress: call trace2_region_leave() only after calling _enter() | 20 May 2020, 15:33:28 UTC |
| 55df1a6 | Junio C Hamano | 20 May 2020, 15:33:27 UTC | Merge branch 'js/ci-sdk-download-fix' Instead of downloading Windows SDK for CI jobs for windows builds from an external site (wingit.blob.core.windows.net), use the one created in the windows-build job, to work around quota issues at the external site. * js/ci-sdk-download-fix: ci: avoid pounding on the poor ci-artifacts container | 20 May 2020, 15:33:28 UTC |
| abbd1d9 | Junio C Hamano | 20 May 2020, 15:33:27 UTC | Merge branch 'en/merge-rename-rename-worktree-fix' When a binary file gets modified and renamed on both sides of history to different locations, both files would be written to the working tree but both would have the contents from "ours". This has been corrected so that the path from each side gets their original content. * en/merge-rename-rename-worktree-fix: merge-recursive: fix rename/rename(1to2) for working tree with a binary | 20 May 2020, 15:33:27 UTC |
| 7b304ab | Junio C Hamano | 20 May 2020, 15:33:27 UTC | Merge branch 'cb/no-more-gmtime' Code clean-up by removing a compatibility implementation of a function we no longer use. * cb/no-more-gmtime: compat: remove gmtime | 20 May 2020, 15:33:27 UTC |
| 74c6cba | Junio C Hamano | 20 May 2020, 15:33:26 UTC | Merge branch 'dd/t1509-i18n-fix' A few tests were not i18n clean. * dd/t1509-i18n-fix: t1509: correct i18n test | 20 May 2020, 15:33:26 UTC |
| 1140772 | Jiang Xin | 20 May 2020, 00:07:30 UTC | Merge branch 'next' of github.com:ChrisADR/git-po * 'next' of github.com:ChrisADR/git-po: l10n: es: 2.27.0 round 1 | 20 May 2020, 00:07:30 UTC |
| e68a527 | Derrick Stolee | 19 May 2020, 19:48:45 UTC | fsck: use ERROR_MULTI_PACK_INDEX The multi-pack-index was added to the data verified by git-fsck in ea5ae6c3 "fsck: verify multi-pack-index". This implementation was based on the implementation for verifying the commit-graph, and a copy-paste error kept the ERROR_COMMIT_GRAPH flag as the bit set when an error appears in the multi-pack-index. Add a new flag, ERROR_MULTI_PACK_INDEX, and use that instead. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2020, 23:13:22 UTC |
| 293194c | Jonathan Tan | 19 May 2020, 18:31:51 UTC | t4067: make rename detection test output raw diff 95acf11a3d ("diff: restrict when prefetching occurs", 2020-04-07) taught diff to prefetch blobs in a more limited set of situations. These limited situations include when the output format requires blob data, and when inexact rename detection is needed. There is an existing test case that tests inexact rename detection, but it also uses an output format that requires blob data, resulting in the inexact-rename-detection-only code not being tested. Update this test to use the raw output format, which does not require blob data. Thanks to Derrick Stolee for noticing this lapse in code coverage and for doing the preliminary analysis [1]. [1] https://lore.kernel.org/git/853759d3-97c3-241f-98e1-990883cd204e@gmail.com/ Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2020, 23:09:16 UTC |
| 1eb7371 | Đoàn Trần Công Danh | 19 May 2020, 00:50:46 UTC | t5703: replace "grep -a" usage by perl On some platforms likes HP-UX, grep(1) doesn't understand "-a". Let's switch to perl. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2020, 18:15:23 UTC |
| e264335 | Martin Ågren | 17 May 2020, 18:52:21 UTC | git-sparse-checkout.txt: add missing ' Where we explain the 'reapply' command, we don't properly wrap it in single quote marks like we do with the other commands: We omit the closing mark ("'reapply") and this ends up being rendered literally as "'reapply". Add the missing "'". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 20:19:54 UTC |
| 0d9cdbc | Martin Ågren | 17 May 2020, 18:52:20 UTC | git-credential.txt: use list continuation Use list continuation to avoid the second and third paragraphs rendering with a different indentation from the first one where we describe the "url" attribute. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 20:19:33 UTC |
| ce3614c | Martin Ågren | 17 May 2020, 18:52:19 UTC | git-commit-graph.txt: fix list rendering The first list item follows immediately on the paragraph where we introduce the list. This makes the "*" render literally as part of one huge paragraph. (With AsciiDoc, everything is fine after that, but with Asciidoctor, we get some minor follow-on errors.) Add an empty line -- with a list continuation ("+") -- to make the first list item render ok. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 20:19:23 UTC |
| 1aa7b68 | Martin Ågren | 17 May 2020, 18:52:18 UTC | git-commit-graph.txt: fix grammo It's easy to mix up the possessive "its" and "it's" ("it is"). Correct an instance of this. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 20:19:20 UTC |
| 833375f | Martin Ågren | 17 May 2020, 18:52:16 UTC | date-formats.txt: fix list continuation The blank line before the lone "+" means it isn't detected as a list continuation, but instead renders literally, at least with AsciiDoc. Drop the empty line and, while at it, add a closing period to the preceding paragraph. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 20:18:56 UTC |
| 01b62aa | Todd Zullinger | 18 May 2020, 19:37:36 UTC | git-bugreport.txt: adjust reference to strftime(3) The strftime(3) man page is outside of the Git suite. Refererence it as we do other external man pages and avoid creating a broken link when generating the HTML documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 19:54:53 UTC |
| 9892dc8 | Abhishek Kumar | 18 May 2020, 14:30:23 UTC | commit-slab-decl.h: update include guard When a9f1f1f9f8 ("commit-slab.h: code split", 2018-05-19) split commit-slab.h into commit-slab-decl.h and commit-slab-impl.h header files, commit-slab-decl.h were left to use "COMMIT_SLAB_HDR_H", while commit-slab-impl.h gained its own macro, "COMMIT_SLAB_IMPL_H". As these two files use different include guards, there is nothing broken, but let's update commit-slab-decl.h to match the convention to name the include guard after the filename. Signed-off-by: Abhishek Kumar <abhishekkumar8222@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 17:33:00 UTC |
| 71800d3 | Đoàn Trần Công Danh | 18 May 2020, 14:52:34 UTC | ci/config: correct instruction for CI preferences From e76eec3554 (ci: allow per-branch config for GitHub Actions, 2020-05-07), we started to allow contributors decide which branch they want to build with GitHub Actions by checking for a file named "ci/config/allow-ref". In order to assist those contributors, we provided a sample in "ci/config/allow-refs.sample", and instructed them to drop the ".sample", then commit that file to their repository. We've misspelt the filename in that change. Let's fix the spelling. While we're at it, also instruct our contributors introduce that new file to Git before commit, in case of they've never told Git before. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 17:18:34 UTC |
| ddcfc7c | Greg Price | 16 May 2020, 05:33:38 UTC | tests: skip small-stack tests on hppa architecture On hppa these tests crash because the allocated stack space is too small, even after it was doubled in b9a190789 (and the data size doubled to match) to make it work on powerpc. For this arch just skip these tests, which is enough to make the whole suite pass. Fixes: https://bugs.debian.org/757402 Based-on-patch-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Greg Price <gnprice@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 May 2020, 17:05:12 UTC |
| 3d5545c | Jiang Xin | 18 May 2020, 01:26:05 UTC | Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 18 May 2020, 01:26:24 UTC |
| 848c9e1 | Christopher Diaz Riveros | 17 May 2020, 23:51:17 UTC | l10n: es: 2.27.0 round 1 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 17 May 2020, 23:51:17 UTC |
| 0b21488 | Jiang Xin | 17 May 2020, 01:39:00 UTC | Merge branch 'master' of github.com:alshopov/git-po into git-po-master * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4868t) | 17 May 2020, 01:39:00 UTC |
