summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-04-15Merge branch 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin1-307/+65
* 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 2
2022-04-14l10n: zh_CN v2.36.0 round 2Libravatar Fangyi Zhou1-307/+65
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-04-14l10n: pt_PT: update Portuguese translationLibravatar Daniel Santos1-6428/+7063
* update the following words translations: commit, untracked, stage, cache, stash, work..., index, reset, label, check..., tags, graft, alternate object, amend, ancestor, cherry-pick, bisect, blame, chain, cache, bug, chunk, branch, bundle, clean, clone, commit-graph, commit object, commit-ish, committer, cover letter, conflict, dangling, detach, dir, dumb, fast-forward, file system, fixup, fork, fetch, Git archive, gitdir, graft, replace ref * correct some mispellings * git-po-helper update * remove some obsolete lines * unfuzzy entries * random translation updates * update contact in pt_PT.po * add the following words to the translation table: override, recurse, print, offset, unbundle, mirror repository, multi-pack, bad, whitespace, batch * remove the following words of the translation table: core Git * change the following words on the translation table: dry-run, apply, patch, replay, blame, chain, gitdir, file system, fork, unset, handle * some translation to the first person * update copyright text * word 'utilização:' to 'uso:' * word 'pai' to 'parente' Signed-off-by: Daniel Santos <dacs.git@brilhante.top>
2022-04-14l10n: vi(5285t): v2.36.0 round 2Libravatar Tran Ngoc Quan1-3937/+4752
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2022-04-14Merge branch 'loc/tw/0407' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-3973/+4749
* 'loc/tw/0407' of github.com:l10n-tw/git-po: l10n: zh_TW: v2.36.0 round 2
2022-04-14l10n: zh_TW: v2.36.0 round 2Libravatar Yi-Jyun Pan1-3973/+4749
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2022-04-13l10n: fr: v2.36 round 2Libravatar Jean-Noël Avila1-89/+165
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-04-13l10n: tr: v2.36.0 round 2Libravatar Emir SARI1-62/+84
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2022-04-13l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed)Libravatar Jiang Xin1-40/+52
Generate po/git.pot from v2.36.0-rc2 for git v2.36.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-04-13Merge branch 'master' of github.com:git/gitLibravatar Jiang Xin31-48/+331
* 'master' of github.com:git/git: (25 commits) Git 2.36-rc2 i18n: fix some badly formatted i18n strings Git 2.36-rc1 t9902: split test to run on appropriate systems ls-tree doc: document interaction with submodules Documentation: add --batch-command to cat-file synopsis git-ls-tree.txt: fix the name of "%(objectsize:padded)" submodule-helper: fix usage string doc: replace "--" with {litdd} in credential-cache/fsmonitor contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518 configure.ac: fix HAVE_SYNC_FILE_RANGE definition git-compat-util: really support openssl as a source of entropy ls-tree: `-l` should not imply recursive listing Git 2.35.2 Git 2.34.2 Git 2.33.2 Git 2.32.1 Git 2.31.2 Git 2.30.3 ...
2022-04-11Git 2.36-rc2Libravatar Junio C Hamano2-1/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-11Merge branch 'ja/i18n-fix-for-2.36'Libravatar Junio C Hamano2-5/+4
Fixes to some localizable strings. * ja/i18n-fix-for-2.36: i18n: fix some badly formatted i18n strings
2022-04-11Merge tag 'v2.35.2'Libravatar Junio C Hamano14-12/+272
2022-04-11i18n: fix some badly formatted i18n stringsLibravatar Jean-Noël Avila2-5/+4
String in submodule--helper is not correctly formatting placeholders. The string in git-send-email is partial. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-11Merge branch 'fr_2.36_rnd1' of github.com:jnavila/gitLibravatar Jiang Xin1-3969/+4717
* 'fr_2.36_rnd1' of github.com:jnavila/git: l10n: fr: v2.36 round 1
2022-04-11Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poLibravatar Jiang Xin2-3937/+4706
* 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN v2.36.0 round 1 l10n: Update zh_CN repo link
2022-04-09l10n: fr: v2.36 round 1Libravatar Jean-Noël Avila1-3969/+4717
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-04-08Git 2.36-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-08Merge branch 'ld/sparse-index-bash-completion'Libravatar Junio C Hamano1-9/+26
Test regression fix. * ld/sparse-index-bash-completion: t9902: split test to run on appropriate systems
2022-04-08Merge branch 'tl/ls-tree-oid-only'Libravatar Junio C Hamano1-2/+2
Docfix. * tl/ls-tree-oid-only: ls-tree doc: document interaction with submodules
2022-04-08t9902: split test to run on appropriate systemsLibravatar Adam Dinwoodie1-9/+26
The "FUNNYNAMES" test prerequisite passes on Cygwin, as the Cygwin file system interface has a workaround for the underlying operating system's lack of support for tabs, newlines or quotes. However, it does not add support for backslash, which is treated as a directory separator, meaning one of the tests added by 48803821b1 ("completion: handle unusual characters for sparse-checkout", 2022-02-07) will fail on Cygwin. To avoid this failure while still getting maximal test coverage, split that test into two: test handling of paths that include tabs on anything that has the FUNNYNAMES prerequisite, but skip testing handling of paths that include backslashes unless both FUNNYNAMES is set and the system is not Cygwin. It might be nice to have more granularity than "FUNNYNAMES" and its sibling "FUNNIERNAMES" provide, so that tests could be run based on specific individual characters supported by the file system being tested, but that seems like it would make the prerequisite checks in this area much more verbose for very little gain. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-08ls-tree doc: document interaction with submodulesLibravatar Ævar Arnfjörð Bjarmason1-2/+2
The ls-tree documentation had never been updated after it learned to interact with submodules to explicitly mention them. The initial support was added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09). E.g. the discussion of --long added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09) didn't explicitly mention them. But this documentation added in 455923e0a15 (ls-tree: introduce "--format" option, 2022-03-23) had no such excuse, and was actively misleading by providing an exhaustive but incomplete list of object types we'd emit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-08l10n: zh_CN v2.36.0 round 1Libravatar Fangyi Zhou1-3935/+4704
Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-04-08l10n: Update zh_CN repo linkLibravatar Fangyi Zhou2-2/+2
Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-04-07Merge branch 'jc/cat-file-batch-commands'Libravatar Junio C Hamano1-1/+1
Doc fix. * jc/cat-file-batch-commands: Documentation: add --batch-command to cat-file synopsis
2022-04-07Documentation: add --batch-command to cat-file synopsisLibravatar Ævar Arnfjörð Bjarmason1-1/+1
440c705ea63 (cat-file: add --batch-command mode, 2022-02-18) added the new option and operating mode without listing it to the synopsis section. Fix it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-07Merge branch 'tz/doc-litdd-fixes'Libravatar Junio C Hamano4-11/+11
Documentation markup fix. * tz/doc-litdd-fixes: doc: replace "--" with {litdd} in credential-cache/fsmonitor
2022-04-07Merge branch 'js/apply-partial-clone-filters-recursively'Libravatar Junio C Hamano1-1/+1
Typofix * js/apply-partial-clone-filters-recursively: submodule-helper: fix usage string
2022-04-07Merge branch 'tl/ls-tree-oid-only'Libravatar Junio C Hamano1-1/+1
* tl/ls-tree-oid-only: git-ls-tree.txt: fix the name of "%(objectsize:padded)"
2022-04-07git-ls-tree.txt: fix the name of "%(objectsize:padded)"Libravatar Martin Ågren1-1/+1
Commit 455923e0a1 ("ls-tree: introduce "--format" option", 2022-03-23) introduced `--format` and the various placeholders it can take, such as %(objectname) and %(objectsize). At some point when that patch was being developed, those placeholders had shorter names, e.g., %(name) and %(size), which can be seen in the commit message of 455923e0a1. One instance of "%(size:padded)" also managed to enter the documentation in the final version of the patch. Correct it to "%(objectsize:padded)". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-07submodule-helper: fix usage stringLibravatar Fangyi Zhou1-1/+1
The missing space at the end of the line makes the closing square bracket sticking to the dash in the next line Found during localisation v2.36.0 round 1 Signed-off-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-07l10n: po-id for 2.36 (round 1)Libravatar Bagas Sanjaya1-4206/+5075
Update following components: * add-interactive.c * branch.c * config.c * help.c * merge-ort-wrappers.c * builtin/bisect--helper.c * builtin/branch.c * builtin/cat-file.c * builtin/checkout.c * builtin/clone.c * builtin/config.c * builtin/reflog.c * builtin/remote.c * builtin/sparse-checkout.c * builtin/submodule--helper.c * builtin/unpack-objects.c Translate following new components: * connect.c * connected.c * date.c * hook.c * files-backend.c * ident.c * merge-ort.c * merge-recursive.c * refs.c * refspec.c * revision.c * symlinks.c * worktree.c * builtin/notes.c * builtin/multi-pack-index.c * builtin/commit.c * builtin/merge-base.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2022-04-06doc: replace "--" with {litdd} in credential-cache/fsmonitorLibravatar Todd Zullinger4-11/+11
Asciidoc renders `--` as em-dash. This is not appropriate for command names. It also breaks linkgit links to these commands. Fix git-credential-cache--daemon and git-fsmonitor--daemon. The latter was added 3248486920 (fsmonitor: document builtin fsmonitor, 2022-03-25) and included several links. A check for broken links in the HTML docs turned this up. Manually inspecting the other Documentation/git-*--*.txt files turned up the issue in git-credential-cache--daemon. While here, quote `git credential-cache--daemon` in the synopsis to match the vast majority of our other documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06Merge branch 'tl/ls-tree-oid-only'Libravatar Junio C Hamano1-1/+1
"git ls-tree" learns "--oid-only" option, similar to "--name-only", and more generalized "--format" option. source: <cover.1648026472.git.dyroneteng@gmail.com> * tl/ls-tree-oid-only: ls-tree: `-l` should not imply recursive listing
2022-04-06Merge branch 'bc/csprng-mktemps'Libravatar Junio C Hamano3-1/+6
Build fix. * bc/csprng-mktemps: git-compat-util: really support openssl as a source of entropy
2022-04-06Merge branch 'ns/core-fsyncmethod'Libravatar Junio C Hamano1-1/+1
A couple of fix-up to a topic that is now in 'master'. source: <pull.1193.git.1648663716891.gitgitgadget@gmail.com> * ns/core-fsyncmethod: configure.ac: fix HAVE_SYNC_FILE_RANGE definition
2022-04-06Merge branch 'ab/make-optim-noop'Libravatar Junio C Hamano2-2/+2
A micro fix to a topic earlier merged to 'master' source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com> * ab/make-optim-noop: contrib/scalar: fix 'all' target in Makefile Documentation/Makefile: fix "make info" regression in dad9cd7d518
2022-04-06contrib/scalar: fix 'all' target in MakefileLibravatar Victoria Dye1-1/+1
Add extra ':' to second 'all' target definition to allow 'scalar' to build. Without this fix, the 'all:' and 'all::' targets together cause a build failure when 'scalar' build is enabled with 'INCLUDE_SCALAR': Makefile:14: *** target file `all' has both : and :: entries. Stop. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06Documentation/Makefile: fix "make info" regression in dad9cd7d518Libravatar Ævar Arnfjörð Bjarmason1-1/+1
Fix a regression in my dad9cd7d518 (Makefile: move ".SUFFIXES" rule to shared.mak, 2022-03-03). As explained in the GNU make documentation for the $* variable, available at: info make --index-search='$*' This rule relied on ".texi" being in the default list of suffixes, as seen at: make -f/dev/null -p | grep -v -e ^# -e ^$|grep -F .SUFFIXES The documentation explains what was going on here: In an explicit rule, there is no stem; so '$*' cannot be determined in that way. Instead, if the target name ends with a recognized suffix (*note Old-Fashioned Suffix Rules: Suffix Rules.), '$*' is set to the target name minus the suffix. For example, if the target name is 'foo.c', then '$*' is set to 'foo', since '.c' is a suffix. GNU 'make' does this bizarre thing only for compatibility with other implementations of 'make'. You should generally avoid using '$*' except in implicit rules or static pattern rules. If the target name in an explicit rule does not end with a recognized suffix, '$*' is set to the empty string for that rule. I.e. this rule added back in 5cefc33bffd (Documentation: add gitman.info target, 2007-12-10) was resolving gitman.texi from gitman.info. We can instead just use the more obvious $< variable referring to the prerequisite. This was the only use of $* in our Makefiles in an explicit rule, the three remaining ones are all implicit rules, and therefore didn't depend on the ".SUFFIXES" list. Reported-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Tested-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06configure.ac: fix HAVE_SYNC_FILE_RANGE definitionLibravatar Adam Dinwoodie1-1/+1
If sync_file_range is not available when building the configure script, there is a cosmetic bug when running that script reporting "HAVE_SYNC_FILE_RANGE: command not found". Remove that error message by defining HAVE_SYNC_FILE_RANGE to an empty string, rather than generating a script where that appears as a bare command. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06git-compat-util: really support openssl as a source of entropyLibravatar Carlo Marcelo Arenas Belón3-1/+6
05cd988dce5 (wrapper: add a helper to generate numbers from a CSPRNG, 2022-01-17), configure openssl as the source for entropy in NON-STOP but doesn't add the needed header or link options. Since the only system that is configured to use openssl as a source of entropy is NON-STOP, add the header unconditionally, and -lcrypto to the list of external libraries. An additional change is required to make sure a NO_OPENSSL=1 build will be able to work as well (tested on Linux with a modified value of CSPRNG_METHOD = openssl), and the more complex logic that allows for compatibility with APPLE_COMMON_CRYPTO or allowing for simpler ways to link (without libssl) has been punted for now. Reported-by: Randall Becker <rsbecker@nexbridge.com> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06ls-tree: `-l` should not imply recursive listingLibravatar Josh Steadmon1-1/+1
In 9c4d58ff2c (ls-tree: split up "fast path" callbacks, 2022-03-23), a refactoring of the various read_tree_at() callbacks caused us to unconditionally recurse into directories if `-l` (long format) was passed on the command line, regardless of whether or not we also pass the `-r` (recursive) flag. Fix this by making show_tree_long() return the value of `recurse`, rather than always returning 1. This value is interpreted by read_tree_at() to be a signal on whether or not to recurse. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-06l10n: tr: v2.36.0 round 1Libravatar Emir SARI1-3958/+4479
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2022-04-06l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed)Libravatar Jiang Xin1-3828/+4320
Generate po/git.pot from v2.36.0-rc0 for git v2.36.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-04-06Merge branch 'master' of github.com:git-l10n/git-poLibravatar Jiang Xin2-4268/+4152
* 'master' of github.com:git-l10n/git-po: l10n: pt_PT: update TEAMS file l10n: pt_PT: update Portuguese translation
2022-04-04Git 2.36-rc0Libravatar Junio C Hamano2-1/+33
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-04Merge branch 'pw/worktree-list-with-z'Libravatar Junio C Hamano3-20/+55
"git worktree list --porcelain" did not c-quote pathnames and lock reasons with unsafe bytes correctly, which is worked around by introducing NUL terminated output format with "-z". * pw/worktree-list-with-z: worktree: add -z option for list subcommand
2022-04-04Merge branch 'jc/coding-guidelines-decl-in-for-loop'Libravatar Junio C Hamano1-1/+4
Coding Guidelines clarification. * jc/coding-guidelines-decl-in-for-loop: CodingGuidelines: give deadline for "for (int i = 0; ..."
2022-04-04Merge branch 'vd/mv-refresh-stat'Libravatar Junio C Hamano2-2/+34
"git mv" failed to refresh the cached stat information for the entry it moved. * vd/mv-refresh-stat: mv: refresh stat info for moved entry
2022-04-04Merge branch 'jh/builtin-fsmonitor-part2'Libravatar Junio C Hamano38-106/+4326
Built-in fsmonitor (part 2). * jh/builtin-fsmonitor-part2: (30 commits) t7527: test status with untracked-cache and fsmonitor--daemon fsmonitor: force update index after large responses fsmonitor--daemon: use a cookie file to sync with file system fsmonitor--daemon: periodically truncate list of modified files t/perf/p7519: add fsmonitor--daemon test cases t/perf/p7519: speed up test on Windows t/perf/p7519: fix coding style t/helper/test-chmtime: skip directories on Windows t/perf: avoid copying builtin fsmonitor files into test repo t7527: create test for fsmonitor--daemon t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon help: include fsmonitor--daemon feature flag in version info fsmonitor--daemon: implement handle_client callback compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows fsmonitor--daemon: create token-based changed path cache fsmonitor--daemon: define token-ids fsmonitor--daemon: add pathname classification fsmonitor--daemon: implement 'start' command ...
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 06:28:14 +0000