git, branch v2.25.0

Git 2.25

2020-01-13T18:16:43Z

Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po

2020-01-12T21:28:13Z

l10n-2.25.0-rnd1 * tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.25.0 l10n round 1 l10n: Update Catalan translation l10n: de.po: Update German translation v2.25.0 round 1 l10n: de.po: Reword generation numbers l10n: bg.po: Updated Bulgarian translation (4800t) l10n: es: 2.25.0 round #1 l10n: sv.po: Update Swedish translation (4800t0f0u) l10n: fr.po v2.25.0 rnd 1 l10n: vi(4800t): Updated Vietnamese translation v2.25.0 l10n: zh_TW.po: update translation for v2.25.0 round 1 l10n: it.po: update the Italian translation for Git 2.25.0 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) l10n: Update Catalan translation l10n: zh_TW: add translation for v2.24.0

Revert "Merge branch 'ra/rebase-i-more-options'"

2020-01-12T21:25:18Z

This reverts commit 5d9324e0f4210bb7d52bcb79efe3935703083f72, reversing changes made to c58ae96fc4bb11916b62a96940bb70bb85ea5992. The topic turns out to be too buggy for real use. cf.

l10n: zh_CN: for git v2.25.0 l10n round 1

2020-01-12T11:22:02Z

Translate 119 new messages (4800t0f0u) for git 2.25.0. Signed-off-by: Jiang Xin

Merge branch 'master' of github.com:Softcatala/git-po into git-po-master

2020-01-11T08:04:21Z

* 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation

Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'

2020-01-10T22:45:27Z

Further tweak to a "no backslash in indexed paths" for Windows port we applied earlier. * js/mingw-loosen-overstrict-tree-entry-checks: mingw: safeguard better against backslashes in file names

Merge branch 'ma/config-advice-markup-fix'

2020-01-10T22:45:26Z

Documentation markup fix. * ma/config-advice-markup-fix: config/advice.txt: fix description list separator

l10n: Update Catalan translation

2020-01-10T21:21:55Z

Signed-off-by: Jordi Mas

mingw: safeguard better against backslashes in file names

2020-01-10T20:29:07Z

In 224c7d70fa1 (mingw: only test index entries for backslashes, not tree entries, 2019-12-31), we relaxed the check for backslashes in tree entries to check only index entries. However, the code change was incorrect: it was added to `add_index_entry_with_check()`, not to `add_index_entry()`, so under certain circumstances it was possible to side-step the protection. Besides, the description of that commit purported that all index entries would be checked when in fact they were only checked when being added to the index (there are code paths that do not do that, constructing "transient" index entries). In any case, it was pointed out in one insightful review at https://github.com/git-for-windows/git/pull/2437#issuecomment-566771835 that it would be a much better idea to teach `verify_path()` to perform the check for a backslash. This is safer, even if it comes with two notable drawbacks: - `verify_path()` cannot say _what_ is wrong with the path, therefore the user will no longer be told that there was a backslash in the path, only that the path was invalid. - The `git apply` command also calls the `verify_path()` function, and might have been able to handle Windows-style paths (i.e. with backslashes instead of forward slashes). This will no longer be possible unless the user (temporarily) sets `core.protectNTFS=false`. Note that `git add ` will _still_ work because `normalize_path_copy_len()` will convert the backslashes to forward slashes before hitting the code path that creates an index entry. The clear advantage is that `verify_path()`'s purpose is to check the validity of the file name, therefore we naturally tap into all the code paths that need safeguarding, also implicitly into future code paths. The benefits of that approach outweigh the downsides, so let's move the check from `add_index_entry_with_check()` to `verify_path()`. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

l10n: de.po: Update German translation v2.25.0 round 1

2020-01-10T11:04:03Z

Signed-off-by: Matthias Rüster Reviewed-by: Ralf Thielow Reviewed-by: Phillip Szelat