diff options
274 files changed, 10149 insertions, 4720 deletions
diff --git a/.clang-format b/.clang-format index 3ed4fac753..16fd12253e 100644 --- a/.clang-format +++ b/.clang-format @@ -72,6 +72,10 @@ AlwaysBreakAfterReturnType: None BinPackArguments: true BinPackParameters: true +# Add no space around the bit field +# unsigned bf:2; +BitFieldColonSpacing: None + # Attach braces to surrounding context except break before braces on function # definitions. # void foo() @@ -96,6 +100,12 @@ BreakStringLiterals: false # Switch statement body is always indented one level more than case labels. IndentCaseLabels: false +# Indents directives before the hash. +# #if FOO +# # include <foo> +# #endif +IndentPPDirectives: AfterHash + # Don't indent a function definition or declaration if it is wrapped after the # type IndentWrappedFunctionNames: false @@ -108,11 +118,18 @@ PointerAlignment: Right # x = (int32)y; not x = (int32) y; SpaceAfterCStyleCast: false +# No space is inserted after the logical not operator +SpaceAfterLogicalNot: false + # Insert spaces before and after assignment operators # int a = 5; not int a=5; # a += 42; a+=42; SpaceBeforeAssignmentOperators: true +# Spaces will be removed before case colon. +# case 1: break; not case 1 : break; +SpaceBeforeCaseColon: false + # Put a space before opening parentheses only after control statement keywords. # void f() { # if (true) { @@ -124,6 +141,14 @@ SpaceBeforeParens: ControlStatements # Don't insert spaces inside empty '()' SpaceInEmptyParentheses: false +# No space before first '[' in arrays +# int a[5][5]; not int a [5][5]; +SpaceBeforeSquareBrackets: false + +# No space will be inserted into {} +# while (true) {} not while (true) { } +SpaceInEmptyBlock: false + # The number of spaces before trailing line comments (// - comments). # This does not affect trailing block comments (/* - comments). SpacesBeforeTrailingComments: 1 @@ -149,20 +174,25 @@ Cpp11BracedListStyle: false # A list of macros that should be interpreted as foreach loops instead of as # function calls. Taken from: -# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' \ -# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ -# | sort | uniq +# git grep -h '^#define [^[:space:]]*for_\?each[^[:space:]]*(' | +# sed "s/^#define / - '/; s/(.*$/'/" | sort | uniq ForEachMacros: - - 'for_each_abbrev' - 'for_each_builtin' - 'for_each_string_list_item' - 'for_each_ut' - 'for_each_wanted_builtin' + - 'hashmap_for_each_entry' + - 'hashmap_for_each_entry_from' + - 'kh_foreach' + - 'kh_foreach_value' - 'list_for_each' - 'list_for_each_dir' - 'list_for_each_prev' - 'list_for_each_prev_safe' - 'list_for_each_safe' + - 'strintmap_for_each_entry' + - 'strmap_for_each_entry' + - 'strset_for_each_entry' # The maximum number of consecutive empty lines to keep. MaxEmptyLinesToKeep: 1 diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml new file mode 100644 index 0000000000..c052a5df23 --- /dev/null +++ b/.github/workflows/check-style.yml @@ -0,0 +1,34 @@ +name: check-style + +# Get the repository with all commits to ensure that we can analyze +# all of the commits contributed via the Pull Request. + +on: + pull_request: + types: [opened, synchronize] + +# Avoid unnecessary builds. Unlike the main CI jobs, these are not +# ci-configurable (but could be). +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + check-style: + env: + CC: clang + jobname: ClangFormat + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - run: ci/install-dependencies.sh + + - name: git clang-format + continue-on-error: true + id: check_out + run: | + ./ci/run-style-check.sh \ + "${{github.event.pull_request.base.sha}}" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37b991e080..2589098eff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,8 +118,31 @@ check-whitespace: image: ubuntu:latest before_script: - ./ci/install-dependencies.sh + # Since $CI_MERGE_REQUEST_TARGET_BRANCH_SHA is only defined for merged + # pipelines, we fallback to $CI_MERGE_REQUEST_DIFF_BASE_SHA, which should + # be defined in all pipelines. script: - - ./ci/check-whitespace.sh "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" + - | + R=${CI_MERGE_REQUEST_TARGET_BRANCH_SHA-${CI_MERGE_REQUEST_DIFF_BASE_SHA:?}} || exit + ./ci/check-whitespace.sh "$R" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + +check-style: + image: ubuntu:latest + allow_failure: true + variables: + CC: clang + jobname: ClangFormat + before_script: + - ./ci/install-dependencies.sh + # Since $CI_MERGE_REQUEST_TARGET_BRANCH_SHA is only defined for merged + # pipelines, we fallback to $CI_MERGE_REQUEST_DIFF_BASE_SHA, which should + # be defined in all pipelines. + script: + - | + R=${CI_MERGE_REQUEST_TARGET_BRANCH_SHA-${CI_MERGE_REQUEST_DIFF_BASE_SHA:?}} || exit + ./ci/run-style-check.sh "$R" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 1d92b2da03..52afb2725f 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -204,6 +204,33 @@ For shell scripts specifically (not exhaustive): local variable="$value" local variable="$(command args)" + - The common construct + + VAR=VAL command args + + to temporarily set and export environment variable VAR only while + "command args" is running is handy, but this triggers an + unspecified behaviour according to POSIX when used for a command + that is not an external command (like shell functions). Indeed, + dash 0.5.10.2-6 on Ubuntu 20.04, /bin/sh on FreeBSD 13, and AT&T + ksh all make a temporary assignment without exporting the variable, + in such a case. As it does not work portably across shells, do not + use this syntax for shell functions. A common workaround is to do + an explicit export in a subshell, like so: + + (incorrect) + VAR=VAL func args + + (correct) + ( + VAR=VAL && + export VAR && + func args + ) + + but be careful that the effect "func" makes to the variables in the + current shell will be lost across the subshell boundary. + - Use octal escape sequences (e.g. "\302\242"), not hexadecimal (e.g. "\xc2\xa2") in printf format strings, since hexadecimal escape sequences are not portable. diff --git a/Documentation/Makefile b/Documentation/Makefile index dc65759cb1..1bd23fbeef 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -204,12 +204,15 @@ ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +ASCIIDOC_EXTRA += -adocinfo=shared ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl endif +ASCIIDOC_DEPS += docinfo.html + SHELL_PATH ?= $(SHELL) # Shell quote; SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) @@ -338,6 +341,9 @@ clean: $(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) GIT-ASCIIDOCFLAGS +docinfo.html: docinfo-html.in + $(QUIET_GEN)$(RM) $@ && cat $< >$@ + $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< diff --git a/Documentation/RelNotes/2.46.0.txt b/Documentation/RelNotes/2.46.0.txt index a0b0b325bc..b25475918a 100644 --- a/Documentation/RelNotes/2.46.0.txt +++ b/Documentation/RelNotes/2.46.0.txt @@ -1,10 +1,6 @@ Git v2.46 Release Notes ======================= -Backward Compatibility Notes - - (None at this moment) - UI, Workflows & Features * The "--rfc" option of "git format-patch" learned to take an @@ -89,6 +85,15 @@ UI, Workflows & Features variable did nothing but giving a "this does not do anything" warning. The warning has been removed. + * The http transport can now be told to send request with + authentication material without first getting a 401 response. + + * A handful of entries are added to the GitFAQ document. + + * "git var GIT_SHELL_PATH" should report the path to the shell used + to spawn external commands, but it didn't do so on Windows, which + has been corrected. + Performance, Internal Implementation, Development Support etc. @@ -150,7 +155,7 @@ Performance, Internal Implementation, Development Support etc. * A new test was added to ensure git commands that are designed to run outside repositories do work. - * Basic unit tests for reftable have been reimplemented under the + * A few tests in reftable library have been rewritten using the unit test framework. * A pair of test helpers that essentially are unit tests on hash @@ -203,11 +208,30 @@ Performance, Internal Implementation, Development Support etc. * When bundleURI interface fetches multiple bundles, Git failed to take full advantage of all bundles and ended up slurping duplicated - objects, which has been corrected.. + objects, which has been corrected. * The code to deal with modified paths that are out-of-cone in a sparsely checked out working tree has been optimized. + * An existing test of oidmap API has been rewritten with the + unit-test framework. + + * The "ort" merge backend saw one bugfix for a crash that happens + when inner merge gets killed, and assorted code clean-ups. + + * A new warning message is issued when a command has to expand a + sparse index to handle working tree cruft that are outside of the + sparse checkout. + + * The test framework learned to take the test body not as a single + string but as a here-document. + + * "git push '' HEAD:there" used to hit a BUG(); it has been corrected + to die with "fatal: bad repository ''". + + * What happens when http.cookieFile gets the special value "" has + been clarified in the documentation. + Fixes since v2.45 ----------------- @@ -381,6 +405,57 @@ Fixes since v2.45 * Code clean-up. (merge 4b837f821e rs/simplify-submodule-helper-super-prefix-invocation later to maint). + * "git describe --dirty --broken" forgot to refresh the index before + seeing if there is any chang, ("git describe --dirty" correctly did + so), which has been corrected. + (merge b8ae42e292 as/describe-broken-refresh-index-fix later to maint). + + * Test suite has been taught not to unnecessarily rely on DNS failing + a bogus external name. + (merge 407cdbd271 jk/tests-without-dns later to maint). + + * GitWeb update to use committer date consistently in rss/atom feeds. + (merge cf6ead095b am/gitweb-feed-use-committer-date later to maint). + + * Custom control structures we invented more recently have been + taught to the clang-format file. + (merge 1457dff9be rs/clang-format-updates later to maint). + + * Developer build procedure fix. + (merge df32729866 tb/dev-build-pedantic-fix later to maint). + + * "git push" that pushes only deletion gave an unnecessary and + harmless error message when push negotiation is configured, which + has been corrected. + (merge 4d8ee0317f jc/disable-push-nego-for-deletion later to maint). + + * Address-looking strings found on the trailer are now placed on the + Cc: list after running through sanitize_address by "git send-email". + (merge c852531f45 cb/send-email-sanitize-trailer-addresses later to maint). + + * Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit + status inverted, which has been corrected. + (merge 8c1d6691bc rj/test-sanitize-leak-log-fix later to maint). + + * The http.cookieFile and http.saveCookies configuration variables + have a few values that need to be avoided, which are now ignored + with warning messages. + (merge 4f5822076f jc/http-cookiefile later to maint). + + * Repacking a repository with multi-pack index started making stupid + pack selections in Git 2.45, which has been corrected. + (merge 8fb6d11fad ds/midx-write-repack-fix later to maint). + + * Fix documentation mark-up regression in 2.45. + (merge 6474da0aa4 ja/doc-markup-updates-fix later to maint). + + * Work around asciidoctor's css that renders `monospace` material + in the SYNOPSIS section of manual pages as block elements. + (merge d44ce6ddd5 js/doc-markup-updates-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 493fdae046 ew/object-convert-leakfix later to maint). (merge 00f3661a0a ss/doc-eol-attr-fix later to maint). + (merge 428c40da61 ri/doc-show-branch-fix later to maint). + (merge 58696bfcaa jc/where-is-bash-for-ci later to maint). + (merge 616e94ca24 tb/doc-max-tree-depth-fix later to maint). diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt new file mode 100644 index 0000000000..fc713b4696 --- /dev/null +++ b/Documentation/RelNotes/2.47.0.txt @@ -0,0 +1,52 @@ +Git v2.47 Release Notes +======================= + +UI, Workflows & Features +------------------------ + + * Many Porcelain commands that internally use the merge machinery + were taught to consistently honor the diff.algorithm configuration. + + * A few descriptions in "git show-ref -h" have been clarified. + + +Performance, Internal Implementation, Development Support etc. +-------------------------------------------------------------- + + * A build tweak knob has been simplified by not setting the value + that is already the default; another unused one has been removed. + + * A CI job that use clang-format to check coding style issues in new + code has been added. + + * The reviewing guidelines document now explicitly encourages people + to give positive reviews and how. + + +Fixes since v2.46 +----------------- + + * "git add -p" by users with diff.suppressBlankEmpty set to true + failed to parse the patch that represents an unmodified empty line + with an empty line (not a line with a single space on it), which + has been corrected. + (merge 60cf761ed1 pw/add-patch-with-suppress-blank-empty later to maint). + + * "git checkout --ours" (no other arguments) complained that the + option is incompatible with branch switching, which is technically + correct, but found confusing by some users. It now says that the + user needs to give pathspec to specify what paths to checkout. + (merge d1e6c61272 jc/checkout-no-op-switch-errors later to maint). + + * It has been documented that we avoid "VAR=VAL shell_func" and why. + (merge 728a1962cd jc/doc-one-shot-export-with-shell-func later to maint). + + * "git rebase --help" referred to "offset" (the difference between + the location a change was taken from and the change gets replaced) + incorrectly and called it "fuzz", which has been corrected. + (merge 70058db385 jc/doc-rebase-fuzz-vs-offset-fix later to maint). + + * Other code cleanup, docfix, build fix, etc. + (merge 8db8786fc2 jt/doc-post-receive-hook-update later to maint). + (merge 1c473dd6af tn/doc-commit-fix later to maint). + (merge bb0498b1bb jc/how-to-maintain-updates later to maint). diff --git a/Documentation/ReviewingGuidelines.txt b/Documentation/ReviewingGuidelines.txt index 515d470d23..6534643cff 100644 --- a/Documentation/ReviewingGuidelines.txt +++ b/Documentation/ReviewingGuidelines.txt @@ -72,12 +72,29 @@ guidance, and concrete tips for interacting with patches on the mailing list. could fix it. This not only helps the author to understand and fix the issue, it also deepens and improves your understanding of the topic. -- Reviews do not need to exclusively point out problems. Feel free to "think out +- Reviews do not need to exclusively point out problems. Positive + reviews indicate that it is not only the original author of the + patches who care about the issue the patches address, and are + highly encouraged. + +- Do not hesitate to give positive reviews on a series from your + work colleague. If your positive review is written well, it will + not make you look as if you two are representing corporate + interest on a series that is otherwise uninteresting to other + community members and shoving it down their throat. + +- Write a positive review in such a way that others can understand + why you support the goal, the approach, and the implementation the + patches took. Make sure to demonstrate that you did thoroughly read + the series and understood problem area well enough to be able to + say that the patches are written well. Feel free to "think out loud" in your review: describe how you read & understood a complex section of a patch, ask a question about something that confused you, point out something - you found exceptionally well-written, etc. In particular, uplifting feedback - goes a long way towards encouraging contributors to participate more actively - in the Git community. + you found exceptionally well-written, etc. + +- In particular, uplifting feedback goes a long way towards + encouraging contributors to participate more actively in the Git + community. ==== Performing your review - Provide your review comments per-patch in a plaintext "Reply-All" email to the diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index fa61241756..0ba8989820 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -116,6 +116,10 @@ advice.*:: skippedCherryPicks:: Shown when linkgit:git-rebase[1] skips a commit that has already been cherry-picked onto the upstream branch. + sparseIndexExpanded:: + Shown when a sparse index is expanded to a full index, which is likely + due to an unexpected set of files existing outside of the + sparse-checkout. statusAheadBehind:: Shown when linkgit:git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt index 93d65e1dfd..60ca9f2b68 100644 --- a/Documentation/config/core.txt +++ b/Documentation/config/core.txt @@ -756,4 +756,5 @@ core.maxTreeDepth:: The maximum depth Git is willing to recurse while traversing a tree (e.g., "a/b/cde/f" has a depth of 4). This is a fail-safe to allow Git to abort cleanly, and should not generally need to - be adjusted. The default is 4096. + be adjusted. When Git is compiled with MSVC, the default is 512. + Otherwise, the default is 2048. diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index 2d4e0c9b86..162b33fc52 100644 --- a/Documentation/config/http.txt +++ b/Documentation/config/http.txt @@ -7,6 +7,11 @@ http.proxy:: linkgit:gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy ++ +Any proxy, however configured, must be completely transparent and must not +modify, transform, or buffer the request or response in any way. Proxies which +are not completely transparent are known to cause various forms of breakage +with Git. http.proxyAuthMethod:: Set the method with which to authenticate against the HTTP proxy. This @@ -56,6 +61,26 @@ http.emptyAuth:: a username in the URL, as libcurl normally requires a username for authentication. +http.proactiveAuth:: + Attempt authentication without first making an unauthenticated attempt and + receiving a 401 response. This can be used to ensure that all requests are + authenticated. If `http.emptyAuth` is set to true, this value has no effect. ++ +If the credential helper used specifies an authentication scheme (i.e., via the +`authtype` field), that value will be used; if a username and password is +provided without a scheme, then Basic authentication is used. The value of the +option determines the scheme requested from the helper. Possible values are: ++ +-- +* `basic` - Request Basic authentication from the helper. +* `auto` - Allow the helper to pick an appropriate scheme. +* `none` - Disable proactive authentication. +-- ++ +Note that TLS should always be used with this configuration, since otherwise it +is easy to accidentally expose plaintext credentials if Basic authentication +is selected. + http.delegation:: Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell @@ -82,12 +107,16 @@ http.cookieFile:: in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). + Set it to an empty string, to accept only new cookies from + the server and send them back in successive requests within same + connection. NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set. http.saveCookies:: If set, store cookies received during requests to the file specified by - http.cookieFile. Has no effect if http.cookieFile is unset. + http.cookieFile. Has no effect if http.cookieFile is unset, or set to + an empty string. http.version:: Use the specified HTTP protocol version when communicating with a server. diff --git a/Documentation/docinfo-html.in b/Documentation/docinfo-html.in new file mode 100644 index 0000000000..fb3560eb92 --- /dev/null +++ b/Documentation/docinfo-html.in @@ -0,0 +1,5 @@ +<style> +pre>code { + display: inline; +} +</style> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 5de18de2ab..8e925db7e9 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -13,9 +13,9 @@ SYNOPSIS [`-l`] [`-s`] [`--no-hardlinks`] [`-q`] [`-n`] [`--bare`] [`--mirror`] [`-o` _<name>_] [`-b` _<name>_] [`-u` _<upload-pack>_] [`--reference` _<repository>_] [`--dissociate`] [`--separate-git-dir` _<git-dir>_] - [`--depth` _<depth>_] [`--`[`no-`]`single-branch`] [`--no-tags`] - [++--recurse-submodules++[++=++__<pathspec>__]] [`--`[`no-`]`shallow-submodules`] - [`--`[`no-`]`remote-submodules`] [`--jobs` _<n>_] [`--sparse`] [`--`[`no-`]`reject-shallow`] + [`--depth` _<depth>_] [`--`[`no-`]{empty}`single-branch`] [`--no-tags`] + [++--recurse-submodules++[++=++__<pathspec>__]] [++--++[++no-++]{empty}++shallow-submodules++] + [`--`[`no-`]{empty}`remote-submodules`] [`--jobs` _<n>_] [`--sparse`] [`--`[`no-`]{empty}`reject-shallow`] [++--filter=++__<filter-spec>__] [`--also-filter-submodules`]] [`--`] _<repository>_ [_<directory>_] diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 89ecfc63a8..c822113c11 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend] - [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)] + [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>] [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--[no-]status] diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 74df345f9e..b18cdbc023 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -737,7 +737,7 @@ The 'apply' backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The -line numbers have to be taken with some fuzz, since the other side +line numbers have to be taken with some offset, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index c771c89770..bc31d8b6d3 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -22,7 +22,7 @@ Shows the commit ancestry graph starting from the commits named with <rev>s or <glob>s (or all refs under refs/heads and/or refs/tags) semi-visually. -It cannot show more than 29 branches and commits at a time. +It cannot show more than 26 branches and commits at a time. It uses `showbranch.default` multi-valued configuration items if no <rev> or <glob> is given on the command line. diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 8c1f2d5675..f2917d142c 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -185,6 +185,58 @@ Then, you can adjust your push URL to use `git@example_author` or `git@example_committer` instead of `git@example.org` (e.g., `git remote set-url git@example_author:org1/project1.git`). +Transfers +--------- + +[[sync-working-tree]] +How do I sync a working tree across systems?:: + First, decide whether you want to do this at all. Git works best when you + push or pull your work using the typical `git push` and `git fetch` commands + and isn't designed to share a working tree across systems. This is + potentially risky and in some cases can cause repository corruption or data + loss. ++ +Usually, doing so will cause `git status` to need to re-read every file in the +working tree. Additionally, Git's security model does not permit sharing a +working tree across untrusted users, so it is only safe to sync a working tree +if it will only be used by a single user across all machines. ++ +It is important not to use a cloud syncing service to sync any portion of a Git +repository, since this can cause corruption, such as missing objects, changed +or added files, broken refs, and a wide variety of other problems. These +services tend to sync file by file on a continuous basis and don't understand +the structure of a Git repository. This is especially bad if they sync the +repository in the middle of it being updated, since that is very likely to +cause incomplete or partial updates and therefore data loss. ++ +An example of the kind of corruption that can occur is conflicts over the state +of refs, such that both sides end up with different commits on a branch that +the other doesn't have. This can result in important objects becoming +unreferenced and possibly pruned by `git gc`, causing data loss. ++ +Therefore, it's better to push your work to either the other system or a central +server using the normal push and pull mechanism. However, this doesn't always +preserve important data, like stashes, so some people prefer to share a working +tree across systems. ++ +If you do this, the recommended approach is to use `rsync -a --delete-after` +(ideally with an encrypted connection such as with `ssh`) on the root of +repository. You should ensure several things when you do this: ++ +* If you have additional worktrees or a separate Git directory, they must be + synced at the same time as the main working tree and repository. +* You are comfortable with the destination directory being an exact copy of the + source directory, _deleting any data that is already there_. +* The repository (including all worktrees and the Git directory) is in a + quiescent state for the duration of the transfer (that is, no operations of + any sort are taking place on it, including background operations like `git + gc` and operations invoked by your editor). ++ +Be aware that even with these recommendations, syncing in this way has some risk +since it bypasses Git's normal integrity checking for repositories, so having +backups is advised. You may also wish to do a `git fsck` to verify the +integrity of your data on the destination system after syncing. + Common Issues ------------- @@ -241,6 +293,42 @@ How do I know if I want to do a fetch or a pull?:: ignore the upstream changes. A pull consists of a fetch followed immediately by either a merge or rebase. See linkgit:git-pull[1]. +[[proxy]] +Can I use a proxy with Git?:: + Yes, Git supports the use of proxies. Git honors the standard `http_proxy`, + `https_proxy`, and `no_proxy` environment variables commonly used on Unix, and + it also can be configured with `http.proxy` and similar options for HTTPS (see + linkgit:git-config[1]). The `http.proxy` and related options can be + customized on a per-URL pattern basis. In addition, Git can in theory + function normally with transparent proxies that exist on the network. ++ +For SSH, Git can support a proxy using OpenSSH's `ProxyCommand`. Commonly used +tools include `netcat` and `socat`. However, they must be configured not to +exit when seeing EOF on standard input, which usually means that `netcat` will +require `-q` and `socat` will require a timeout with something like `-t 10`. +This is required because the way the Git SSH server knows that no more requests +will be made is an EOF on standard input, but when that happens, the server may +not have yet processed the final request, so dropping the connection at that +point would interrupt that request. ++ +An example configuration entry in `~/.ssh/config` with an HTTP proxy might look +like this: ++ +---- +Host git.example.org + User git + ProxyCommand socat -t 10 - PROXY:proxy.example.org:%h:%p,proxyport=8080 +---- ++ +Note that in all cases, for Git to work properly, the proxy must be completely +transparent. The proxy cannot modify, tamper with, or buffer the connection in +any way, or Git will almost certainly fail to work. Note that many proxies, +including many TLS middleboxes, Windows antivirus and firewall programs other +than Windows Defender and Windows Firewall, and filtering proxies fail to meet +this standard, and as a result end up breaking Git. Because of the many +reports of problems and their poor security history, we recommend against the +use of these classes of software and devices. + Merging and Rebasing -------------------- @@ -357,8 +445,9 @@ I'm on Windows and git diff shows my files as having a `^M` at the end.:: + You can store the files in the repository with Unix line endings and convert them automatically to your platform's line endings. To do that, set the -configuration option `core.eol` to `native` and see the following entry for -information about how to configure files as text or binary. +configuration option `core.eol` to `native` and see +<<recommended-storage-settings,the question on recommended storage settings>> +for information about how to configure files as text or binary. + You can also control this behavior with the `core.whitespace` setting if you don't wish to remove the carriage returns from your line endings. @@ -420,14 +509,26 @@ references, URLs, and hashes stored in the repository. + We also recommend setting a linkgit:gitattributes[5] file to explicitly mark which files are text and which are binary. If you want Git to guess, you can -set the attribute `text=auto`. For example, the following might be appropriate -in some projects: +set the attribute `text=auto`. ++ +With text files, Git will generally ensure that LF endings are used in the +repository. The `core.autocrlf` and `core.eol` configuration variables specify +what line-ending convention is followed when any text file is checked out. You +can also use the `eol` attribute (e.g., `eol=crlf`) to override which files get +what line-ending treatment. ++ +For example, generally shell files must have LF endings and batch files must +have CRLF endings, so the following might be appropriate in some projects: + ---- # By default, guess. * text=auto # Mark all C files as text. *.c text +# Ensure all shell files have LF endings and all batch files have CRLF +# endings in the working tree and both have LF in the repo. +*.sh text eol=lf +*.bat text eol=crlf # Mark all JPEG files as binary. *.jpg binary ---- diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 06e997131b..0397dec64d 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -415,13 +415,13 @@ post-receive This hook is invoked by linkgit:git-receive-pack[1] when it reacts to `git push` and updates reference(s) in its repository. -It executes on the remote repository once after all the refs have -been updated. +The hook executes on the remote repository once after all the proposed +ref updates are processed and if at least one ref is updated as the +result. -This hook executes once for the receive operation. It takes no -arguments, but gets the same information as the -<<pre-receive,'pre-receive'>> -hook does on its standard input. +The hook takes no arguments. It receives one line on standard input for +each ref that is successfully updated following the same format as the +<<pre-receive,'pre-receive'>> hook. This hook does not affect the outcome of `git receive-pack`, as it is called after the real work is done. @@ -448,6 +448,9 @@ environment variables will not be set. If the client selects to use push options, but doesn't transmit any, the count variable will be set to zero, `GIT_PUSH_OPTION_COUNT=0`. +See the "post-receive" section in linkgit:git-receive-pack[1] for +additional details. + [[post-update]] post-update ~~~~~~~~~~~ diff --git a/Documentation/gitpacking.txt b/Documentation/gitpacking.txt index 4a6fcba6f7..321154d4e6 100644 --- a/Documentation/gitpacking.txt +++ b/Documentation/gitpacking.txt @@ -143,14 +143,16 @@ include::config/bitmap-pseudo-merge.txt[] Suppose that you have a repository with a large number of references, and you want a bare-bones configuration of pseudo-merge bitmaps that will enhance bitmap coverage of the `refs/` namespace. You may start -wiht a configuration like so: +with a configuration like so: - [bitmapPseudoMerge "all"] +---- +[bitmapPseudoMerge "all"] pattern = "refs/" threshold = now stableThreshold = never sampleRate = 100 maxMerges = 64 +---- This will create pseudo-merge bitmaps for all references, regardless of their age, and group them into 64 pseudo-merge commits. @@ -159,8 +161,10 @@ If you wanted to separate tags from branches when generating pseudo-merge commits, you would instead define the pattern with a capture group, like so: - [bitmapPseudoMerge "all"] +---- +[bitmapPseudoMerge "all"] pattern = "refs/(heads/tags)/" +---- Suppose instead that you are working in a fork-network repository, with each fork specified by some numeric ID, and whose refs reside in @@ -168,12 +172,14 @@ each fork specified by some numeric ID, and whose refs reside in fork) in the network. In this instance, you may instead write something like: - [bitmapPseudoMerge "all"] +---- +[bitmapPseudoMerge "all"] pattern = "refs/virtual/([0-9]+)/(heads|tags)/" threshold = now stableThreshold = never sampleRate = 100 maxMerges = 64 +---- Which would generate pseudo-merge group identifiers like "1234-heads", and "5678-tags" (for branches in fork "1234", and tags in remote "5678", diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 30b394ab47..42afe04869 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -550,7 +550,7 @@ The following pseudorefs are known to Git: to the result. [[def_ref]]ref:: - A name that that points to an <<def_object_name,object name>> or + A name that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt index 013014bbef..41f54050f8 100644 --- a/Documentation/howto/maintain-git.txt +++ b/Documentation/howto/maintain-git.txt @@ -37,22 +37,20 @@ The Policy The policy on Integration is informally mentioned in "A Note from the maintainer" message, which is periodically posted to -this mailing list after each feature release is made. +the mailing list after each feature release is made: - Feature releases are numbered as vX.Y.0 and are meant to contain bugfixes and enhancements in any area, including functionality, performance and usability, without regression. - - One release cycle for a feature release is expected to last for - eight to ten weeks. - - - Maintenance releases are numbered as vX.Y.Z and are meant + - Maintenance releases are numbered as vX.Y.Z (0 < Z) and are meant to contain only bugfixes for the corresponding vX.Y.0 feature release and earlier maintenance releases vX.Y.W (W < Z). - - 'master' branch is used to prepare for the next feature + - The 'master' branch is used to prepare for the next feature release. In other words, at some point, the tip of 'master' - branch is tagged with vX.Y.0. + branch is tagged as vX.(Y+1).0, when vX.Y.0 is the latest + feature release. - 'maint' branch is used to prepare for the next maintenance release. After the feature release vX.Y.0 is made, the tip @@ -63,11 +61,13 @@ this mailing list after each feature release is made. - 'next' branch is used to publish changes (both enhancements and fixes) that (1) have worthwhile goal, (2) are in a fairly good shape suitable for everyday use, (3) but have not yet - demonstrated to be regression free. New changes are tested - in 'next' before merged to 'master'. + demonstrated to be regression free. Reviews from contributors on + the mailing list help to make the determination. After a topic + is merged to 'next', it is tested for at least 7 calendar days + before getting merged to 'master'. - 'seen' branch is used to publish other proposed changes that do - not yet pass the criteria set for 'next'. + not yet pass the criteria set for 'next' (see above). - The tips of 'master' and 'maint' branches will not be rewound to allow people to build their own customization on top of them. @@ -86,6 +86,38 @@ this mailing list after each feature release is made. users are encouraged to test it so that regressions and bugs are found before new topics are merged to 'master'. + - When a problem is found in a topic in 'next', the topic is marked + not to be merged to 'master'. Follow-up patches are discussed on + the mailing list and applied to the topic after being reviewed and + then the topic is merged (again) to 'next'. After going through + the usual testing in 'next', the entire (fixed) topic is merged + to 'master'. + + - One release cycle for a feature release is expected to last for + eight to ten weeks. A few "release candidate" releases are + expected to be tagged about a week apart before the final + release, and a "preview" release is tagged about a week before + the first release candidate gets tagged. + + - After the preview release is tagged, topics that were well + reviewed may be merged to 'master' before spending the usual 7 + calendar days in 'next', with the expectation that any bugs in + them can be caught and fixed in the release candidates before + the final release. + + - After the first release candidate is tagged, the contributors are + strongly encouraged to focus on finding and fixing new regressions + introduced during the cycle, over addressing old bugs and any new + features. Topics stop getting merged down from 'next' to 'master', + and new topics stop getting merged to 'next'. Unless they are fixes + to new regressions in the cycle, that is. + + - Soon after a feature release is made, the tip of 'maint' gets + fast-forwarded to point at the release. Topics that have been + kept in 'next' are merged down to 'master' and a new development + cycle starts. + + Note that before v1.9.0 release, the version numbers used to be structured slightly differently. vX.Y.Z were feature releases while vX.Y.Z.W were maintenance releases for vX.Y.Z. @@ -179,12 +211,12 @@ by doing the following: The initial round is done with: $ git checkout ai/topic ;# or "git checkout -b ai/topic master" - $ git am -sc3 mailbox + $ git am -sc3 --whitespace=warn mailbox and replacing an existing topic with subsequent round is done with: $ git checkout master...ai/topic ;# try to reapply to the same base - $ git am -sc3 mailbox + $ git am -sc3 --whitespace=warn mailbox to prepare the new round on a detached HEAD, and then @@ -209,39 +241,59 @@ by doing the following: (trivial typofixes etc. are often squashed directly into the patches that need fixing, without being applied as a separate "SQUASH???" commit), so that they can be removed easily as needed. + The expectation is that the original author will make corrections + in a reroll. + - By now, new topic branches are created and existing topic + branches are updated. The integration branches 'next', 'jch', + and 'seen' need to be updated to contain them. - - Merge maint to master as needed: + - If there are topics that have been merged to 'master' and should + be merged to 'maint', merge them to 'maint', and update the + release notes to the next maintenance release. - $ git checkout master - $ git merge maint - $ make test + - Review the latest issue of "What's cooking" again. Are topics + that have been sufficiently long in 'next' ready to be merged to + 'master'? Are topics we saw earlier and are in 'seen' now got + positive reviews and are ready to be merged to 'next'? - - Merge master to next as needed: + - If there are topics that have been cooking in 'next' long enough + and should be merged to 'master', merge them to 'master', and + update the release notes to the next feature release. - $ git checkout next - $ git merge master - $ make test + - If there were patches directly made on 'maint', merge 'maint' to + 'master'; make sure that the result is what you want. - - Review the last issue of "What's cooking" again and see if topics - that are ready to be merged to 'next' are still in good shape - (e.g. has there any new issue identified on the list with the - series?) + $ git checkout master + $ git merge -m "Sync with 'maint'" --no-log maint + $ git log -p --first-parent ORIG_HEAD.. + $ make test - - Prepare 'jch' branch, which is used to represent somewhere - between 'master' and 'seen' and often is slightly ahead of 'next'. + - Prepare to update the 'jch' branch, which is used to represent + somewhere between 'master' and 'seen' and often is slightly ahead + of 'next', and the 'seen' branch, which is used to hold the rest. $ Meta/Reintegrate master..jch >Meta/redo-jch.sh The result is a script that lists topics to be merged in order to - rebuild 'seen' as the input to Meta/Reintegrate script. Remove - later topics that should not be in 'jch' yet. Add a line that - consists of '### match next' before the name of the first topic - in the output that should be in 'jch' but not in 'next' yet. + rebuild the current 'jch'. Do the same for 'seen'. + + - Review the Meta/redo-jch.sh and Meta/redo-seen.sh scripts. The + former should have a line '### match next'---the idea is that + merging the topics listed before the line on top of 'master' + should result in a tree identical to that of 'next'. - - Now we are ready to start merging topics to 'next'. For each - branch whose tip is not merged to 'next', one of three things can - happen: + - As newly created topics are usually merged near the tip of + 'seen', add them to the end of the Meta/redo-seen.sh script. + Among the topics that were in 'seen', there may be ones that + are not quite ready for 'next' but are getting there. Move + them from Meta/redo-seen.sh to the end of Meta/redo-jch.sh. + The expectation is that you'd use 'jch' as your daily driver + as the first guinea pig, so you should choose carefully. + + - Now we are ready to start rebuilding 'jch' and merging topics to + 'next'. For each branch whose tip is not merged to 'next', one + of three things can happen: - The commits are all next-worthy; merge the topic to next; - The new parts are of mixed quality, but earlier ones are @@ -252,10 +304,12 @@ by doing the following: If a topic that was already in 'next' gained a patch, the script would list it as "ai/topic~1". To include the new patch to the updated 'next', drop the "~1" part; to keep it excluded, do not - touch the line. If a topic that was not in 'next' should be - merged to 'next', add it at the end of the list. Then: + touch the line. + + If a topic that was not in 'next' should be merged to 'next', add + it before the '### match next' line. Then: - $ git checkout -B jch master + $ git checkout --detach master $ sh Meta/redo-jch.sh -c1 to rebuild the 'jch' branch from scratch. "-c1" tells the script @@ -267,26 +321,29 @@ by doing the following: reference to the variable under its old name), in which case prepare an appropriate merge-fix first (see appendix), and rebuild the 'jch' branch from scratch, starting at the tip of - 'master'. + 'master', this time without using "-c1" to merge all topics. - Then do the same to 'next' + Then do the same to 'next'. $ git checkout next $ sh Meta/redo-jch.sh -c1 -e The "-e" option allows the merge message that comes from the history of the topic and the comments in the "What's cooking" to - be edited. The resulting tree should match 'jch' as the same set - of topics are merged on 'master'; otherwise there is a mismerge. - Investigate why and do not proceed until the mismerge is found - and rectified. + be edited. The resulting tree should match 'jch^{/^### match next'}' + as the same set of topics are merged on 'master'; otherwise there + is a mismerge. Investigate why and do not proceed until the mismerge + is found and rectified. + + If 'master' was updated before you started redoing 'next', then - $ git diff jch next + $ git diff 'jch^{/^### match next}' next - Then build the rest of 'jch': + would show differences that went into 'master' (which 'jch' has, + but 'next' does not yet---often it is updates to the release + notes). Merge 'master' back to 'next' if that is the case. - $ git checkout jch - $ sh Meta/redo-jch.sh + $ git merge -m "Sync with 'master'" --no-log master When all is well, clean up the redo-jch.sh script with @@ -296,12 +353,7 @@ by doing the following: merged to 'master'. This may lose '### match next' marker; add it again to the appropriate place when it happens. - - Rebuild 'seen'. - - $ Meta/Reintegrate jch..seen >Meta/redo-seen.sh - - Edit the result by adding new topics that are not still in 'seen' - in the script. Then + - Rebuild 'seen' on top of 'jch'. $ git checkout -B seen jch $ sh Meta/redo-seen.sh @@ -312,7 +364,7 @@ by doing the following: Double check by running - $ git branch --no-merged seen + $ git branch --no-merged seen '??/*' to see there is no unexpected leftover topics. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 3e96943375..ee71e9d8aa 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.46.0-rc0 +DEF_VER=v2.46.GIT LF=' ' @@ -809,7 +809,6 @@ TEST_BUILTINS_OBJS += test-match-trees.o TEST_BUILTINS_OBJS += test-mergesort.o TEST_BUILTINS_OBJS += test-mktemp.o TEST_BUILTINS_OBJS += test-oid-array.o -TEST_BUILTINS_OBJS += test-oidmap.o TEST_BUILTINS_OBJS += test-online-cpus.o TEST_BUILTINS_OBJS += test-pack-mtimes.o TEST_BUILTINS_OBJS += test-parse-options.o @@ -1337,9 +1336,12 @@ UNIT_TEST_PROGRAMS += t-ctype UNIT_TEST_PROGRAMS += t-example-decorate UNIT_TEST_PROGRAMS += t-hash UNIT_TEST_PROGRAMS += t-mem-pool +UNIT_TEST_PROGRAMS += t-oidmap UNIT_TEST_PROGRAMS += t-oidtree UNIT_TEST_PROGRAMS += t-prio-queue UNIT_TEST_PROGRAMS += t-reftable-basics +UNIT_TEST_PROGRAMS += t-reftable-merged +UNIT_TEST_PROGRAMS += t-reftable-record UNIT_TEST_PROGRAMS += t-strbuf UNIT_TEST_PROGRAMS += t-strcmp-offset UNIT_TEST_PROGRAMS += t-strvec @@ -1375,7 +1377,7 @@ PTHREAD_CFLAGS = # For the 'sparse' target SPARSE_FLAGS ?= -std=gnu99 -SP_EXTRA_FLAGS = -Wno-universal-initializer +SP_EXTRA_FLAGS = # For informing GIT-BUILD-OPTIONS of the SANITIZE=leak,address targets SANITIZE_LEAK = @@ -2679,9 +2681,7 @@ REFTABLE_OBJS += reftable/writer.o REFTABLE_TEST_OBJS += reftable/block_test.o REFTABLE_TEST_OBJS += reftable/dump.o -REFTABLE_TEST_OBJS += reftable/merged_test.o REFTABLE_TEST_OBJS += reftable/pq_test.o -REFTABLE_TEST_OBJS += reftable/record_test.o REFTABLE_TEST_OBJS += reftable/readwrite_test.o REFTABLE_TEST_OBJS += reftable/stack_test.o REFTABLE_TEST_OBJS += reftable/test_framework.o @@ -1 +1 @@ -Documentation/RelNotes/2.46.0.txt
\ No newline at end of file +Documentation/RelNotes/2.47.0.txt
\ No newline at end of file diff --git a/add-patch.c b/add-patch.c index f2c76b7d83..1cec4ab67b 100644 --- a/add-patch.c +++ b/add-patch.c @@ -404,6 +404,12 @@ static void complete_file(char marker, struct hunk *hunk) hunk->splittable_into++; } +/* Empty context lines may omit the leading ' ' */ +static int normalize_marker(const char *p) +{ + return p[0] == '\n' || (p[0] == '\r' && p[1] == '\n') ? ' ' : p[0]; +} + static int parse_diff(struct add_p_state *s, const struct pathspec *ps) { struct strvec args = STRVEC_INIT; @@ -489,6 +495,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) while (p != pend) { char *eol = memchr(p, '\n', pend - p); const char *deleted = NULL, *mode_change = NULL; + char ch = normalize_marker(p); if (!eol) eol = pend; @@ -536,7 +543,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) * Start counting into how many hunks this one can be * split */ - marker = *p; + marker = ch; } else if (hunk == &file_diff->head && starts_with(p, "new file")) { file_diff->added = 1; @@ -590,10 +597,10 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps) (int)(eol - (plain->buf + file_diff->head.start)), plain->buf + file_diff->head.start); - if ((marker == '-' || marker == '+') && *p == ' ') + if ((marker == '-' || marker == '+') && ch == ' ') hunk->splittable_into++; - if (marker && *p != '\\') - marker = *p; + if (marker && ch != '\\') + marker = ch; p = eol == pend ? pend : eol + 1; hunk->end = p - plain->buf; @@ -817,7 +824,7 @@ static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff, (int)(hunk->end - hunk->start), plain + hunk->start); - if (plain[overlap_end] != ' ') + if (normalize_marker(&plain[overlap_end]) != ' ') return error(_("expected context line " "#%d in\n%.*s"), (int)(j + 1), @@ -957,7 +964,7 @@ static int split_hunk(struct add_p_state *s, struct file_diff *file_diff, context_line_count = 0; while (splittable_into > 1) { - ch = s->plain.buf[current]; + ch = normalize_marker(&s->plain.buf[current]); if (!ch) BUG("buffer overrun while splitting hunks"); @@ -1175,14 +1182,14 @@ static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk, header->old_count = header->new_count = 0; for (i = hunk->start; i < hunk->end; ) { - switch (s->plain.buf[i]) { + switch(normalize_marker(&s->plain.buf[i])) { case '-': header->old_count++; break; case '+': header->new_count++; break; - case ' ': case '\r': case '\n': + case ' ': header->old_count++; header->new_count++; break; @@ -78,6 +78,7 @@ static struct { [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse" }, [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure" }, [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks" }, + [ADVICE_SPARSE_INDEX_EXPANDED] = { "sparseIndexExpanded" }, [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning" }, [ADVICE_STATUS_HINTS] = { "statusHints" }, [ADVICE_STATUS_U_OPTION] = { "statusUoption" }, @@ -45,6 +45,7 @@ enum advice_type { ADVICE_SEQUENCER_IN_USE, ADVICE_SET_UPSTREAM_FAILURE, ADVICE_SKIPPED_CHERRY_PICKS, + ADVICE_SPARSE_INDEX_EXPANDED, ADVICE_STATUS_AHEAD_BEHIND_WARNING, ADVICE_STATUS_HINTS, ADVICE_STATUS_U_OPTION, diff --git a/builtin/am.c b/builtin/am.c index 370f5593f2..a12be088f7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1630,7 +1630,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa * changes. */ - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); o.branch1 = "HEAD"; their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg); diff --git a/builtin/checkout.c b/builtin/checkout.c index 3cf44b4683..0f21ddd2c6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -884,7 +884,7 @@ static int merge_working_tree(const struct checkout_opts *opts, add_files_to_cache(the_repository, NULL, NULL, NULL, 0, 0); - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); o.verbosity = 0; work = write_in_core_index_as_tree(the_repository); @@ -1572,6 +1572,10 @@ static void die_if_switching_to_a_branch_in_use(struct checkout_opts *opts, static int checkout_branch(struct checkout_opts *opts, struct branch_info *new_branch_info) { + int noop_switch = (!new_branch_info->name && + !opts->new_branch && + !opts->force_detach); + if (opts->pathspec.nr) die(_("paths cannot be used with switching branches")); @@ -1583,9 +1587,14 @@ static int checkout_branch(struct checkout_opts *opts, die(_("'%s' cannot be used with switching branches"), "--[no]-overlay"); - if (opts->writeout_stage) - die(_("'%s' cannot be used with switching branches"), - "--ours/--theirs"); + if (opts->writeout_stage) { + const char *msg; + if (noop_switch) + msg = _("'%s' needs the paths to check out"); + else + msg = _("'%s' cannot be used with switching branches"); + die(msg, "--ours/--theirs"); + } if (opts->force && opts->merge) die(_("'%s' cannot be used with '%s'"), "-f", "-m"); @@ -1612,10 +1621,8 @@ static int checkout_branch(struct checkout_opts *opts, die(_("Cannot switch branch to a non-commit '%s'"), new_branch_info->name); - if (!opts->switch_branch_doing_nothing_is_ok && - !new_branch_info->name && - !opts->new_branch && - !opts->force_detach) + if (noop_switch && + !opts->switch_branch_doing_nothing_is_ok) die(_("missing branch or commit argument")); if (!opts->implicit_detach && diff --git a/builtin/commit.c b/builtin/commit.c index dec78dfb86..66427ba82d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -41,7 +41,7 @@ static const char * const builtin_commit_usage[] = { N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" - " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n" + " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" diff --git a/builtin/describe.c b/builtin/describe.c index e5287eddf2..cf8edc4222 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -53,6 +53,10 @@ static const char *diff_index_args[] = { "diff-index", "--quiet", "HEAD", "--", NULL }; +static const char *update_index_args[] = { + "update-index", "--unmerged", "-q", "--refresh", NULL +}; + struct commit_name { struct hashmap_entry entry; struct object_id peeled; @@ -645,6 +649,14 @@ int cmd_describe(int argc, const char **argv, const char *prefix) if (argc == 0) { if (broken) { struct child_process cp = CHILD_PROCESS_INIT; + + strvec_pushv(&cp.args, update_index_args); + cp.git_cmd = 1; + cp.no_stdin = 1; + cp.no_stdout = 1; + run_command(&cp); + + child_process_init(&cp); strvec_pushv(&cp.args, diff_index_args); cp.git_cmd = 1; cp.no_stdin = 1; diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 82bebea15b..e951b09805 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -31,7 +31,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix UNUSED) char *better1, *better2; struct commit *result; - init_merge_options(&o, the_repository); + init_basic_merge_options(&o, the_repository); if (argv[0] && ends_with(argv[0], "-subtree")) o.subtree_shift = ""; diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index dab2fdc2a6..9bca9b5f33 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -571,7 +571,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix) }; /* Init merge options */ - init_merge_options(&o.merge_options, the_repository); + init_ui_merge_options(&o.merge_options, the_repository); /* Parse arguments */ original_argc = argc - 1; /* ignoring argv[0] */ diff --git a/builtin/merge.c b/builtin/merge.c index 9fba27d85d..c896b18d1a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -724,7 +724,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, return 2; } - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); if (!strcmp(strategy, "subtree")) o.subtree_shift = ""; diff --git a/builtin/push.c b/builtin/push.c index 8260c6e46a..7a67398124 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -96,9 +96,8 @@ static void refspec_append_mapped(struct refspec *refspec, const char *ref, refspec_append(refspec, ref); } -static void set_refspecs(const char **refs, int nr, const char *repo) +static void set_refspecs(const char **refs, int nr, struct remote *remote) { - struct remote *remote = NULL; struct ref *local_refs = NULL; int i; @@ -124,17 +123,10 @@ static void set_refspecs(const char **refs, int nr, const char *repo) local_refs = get_local_heads(); /* Does "ref" uniquely name our ref? */ - if (count_refspec_match(ref, local_refs, &matched) != 1) { + if (count_refspec_match(ref, local_refs, &matched) != 1) refspec_append(&rs, ref); - } else { - /* lazily grab remote */ - if (!remote) - remote = remote_get(repo); - if (!remote) - BUG("must get a remote for repo '%s'", repo); - + else refspec_append_mapped(&rs, ref, remote, matched); - } } else refspec_append(&rs, ref); } @@ -630,10 +622,8 @@ int cmd_push(int argc, const char **argv, const char *prefix) if (tags) refspec_append(&rs, "refs/tags/*"); - if (argc > 0) { + if (argc > 0) repo = argv[0]; - set_refspecs(argv + 1, argc - 1, repo); - } remote = pushremote_get(repo); if (!remote) { @@ -649,6 +639,9 @@ int cmd_push(int argc, const char **argv, const char *prefix) " git push <name>\n")); } + if (argc > 0) + set_refspecs(argv + 1, argc - 1, remote); + if (remote->mirror) flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE); diff --git a/builtin/replay.c b/builtin/replay.c index 0448326636..9acf51c32b 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -377,7 +377,7 @@ int cmd_replay(int argc, const char **argv, const char *prefix) goto cleanup; } - init_merge_options(&merge_opt, the_repository); + init_basic_merge_options(&merge_opt, the_repository); memset(&result, 0, sizeof(result)); merge_opt.show_rename_progress = 0; last_commit = onto; diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 839a5c29f3..85700caae9 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -293,8 +293,8 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix) struct show_one_options show_one_opts = {0}; int verify = 0, exists = 0; const struct option show_ref_options[] = { - OPT_BOOL(0, "tags", &patterns_opts.tags_only, N_("only show tags (can be combined with branches)")), - OPT_BOOL(0, "branches", &patterns_opts.branches_only, N_("only show branches (can be combined with tags)")), + OPT_BOOL(0, "tags", &patterns_opts.tags_only, N_("only show tags (can be combined with --branches)")), + OPT_BOOL(0, "branches", &patterns_opts.branches_only, N_("only show branches (can be combined with --tags)")), OPT_HIDDEN_BOOL(0, "heads", &patterns_opts.branches_only, N_("deprecated synonym for --branches")), OPT_BOOL(0, "exists", &exists, N_("check for reference existence without resolving")), diff --git a/builtin/stash.c b/builtin/stash.c index 46b981c4dd..fb75ca219e 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -574,7 +574,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, } } - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); o.branch1 = "Updated upstream"; o.branch2 = "Stashed changes"; diff --git a/builtin/var.c b/builtin/var.c index 5dc384810c..e30ff45be1 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -12,6 +12,7 @@ #include "refs.h" #include "path.h" #include "strbuf.h" +#include "run-command.h" static const char var_usage[] = "git var (-l | <variable>)"; @@ -51,7 +52,7 @@ static char *default_branch(int ident_flag UNUSED) static char *shell_path(int ident_flag UNUSED) { - return xstrdup(SHELL_PATH); + return git_shell_path(); } static char *git_attr_val_system(int ident_flag UNUSED) diff --git a/ci/check-directional-formatting.bash b/ci/check-directional-formatting.bash index e6211b141a..3cbbb7030e 100755 --- a/ci/check-directional-formatting.bash +++ b/ci/check-directional-formatting.bash @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script verifies that the non-binary files tracked in the Git index do # not contain any Unicode directional formatting: such formatting could be used diff --git a/ci/check-whitespace.sh b/ci/check-whitespace.sh index db399097a5..c40804394c 100755 --- a/ci/check-whitespace.sh +++ b/ci/check-whitespace.sh @@ -9,7 +9,7 @@ baseCommit=$1 outputFile=$2 url=$3 -if test "$#" -ne 1 && test "$#" -ne 3 +if test "$#" -ne 1 && test "$#" -ne 3 || test -z "$1" then echo "USAGE: $0 <BASE_COMMIT> [<OUTPUT_FILE> <URL>]" exit 1 @@ -21,6 +21,12 @@ commitText= commitTextmd= goodParent= +if ! git rev-parse --quiet --verify "${baseCommit}" +then + echo "Invalid <BASE_COMMIT> '${baseCommit}'" + exit 1 +fi + while read dash sha etc do case "${dash}" in @@ -67,7 +73,7 @@ then goodParent=${baseCommit: 0:7} fi - echo "A whitespace issue was found in onen of more of the commits." + echo "A whitespace issue was found in one or more of the commits." echo "Run the following command to resolve whitespace issues:" echo "git rebase --whitespace=fix ${goodParent}" diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 6ec0f85972..fb34ced8f0 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -87,6 +87,10 @@ macos-*) esac case "$jobname" in +ClangFormat) + sudo apt-get -q update + sudo apt-get -q -y install clang-format + ;; StaticAnalysis) sudo apt-get -q update sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \ @@ -370,7 +370,6 @@ linux-musl) linux-leaks|linux-reftable-leaks) export SANITIZE=leak export GIT_TEST_PASSING_SANITIZE_LEAK=true - export GIT_TEST_SANITIZE_LEAK_LOG=true ;; linux-asan-ubsan) export SANITIZE=address,undefined diff --git a/ci/run-style-check.sh b/ci/run-style-check.sh new file mode 100755 index 0000000000..6cd4b1d934 --- /dev/null +++ b/ci/run-style-check.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Perform style check +# + +baseCommit=$1 + +# Remove optional braces of control statements (if, else, for, and while) +# according to the LLVM coding style. This avoids braces on simple +# single-statement bodies of statements but keeps braces if one side of +# if/else if/.../else cascade has multi-statement body. +# +# As this rule comes with a warning [1], we want to experiment with it +# before adding it in-tree. since the CI job for the style check is allowed +# to fail, appending the rule here allows us to validate its efficacy. +# While also ensuring that end-users are not affected directly. +# +# [1]: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#removebracesllvm +{ + cat .clang-format + echo "RemoveBracesLLVM: true" +} >/tmp/clang-format-rules + +git clang-format --style=file:/tmp/clang-format-rules \ + --diff --extensions c,h "$baseCommit" diff --git a/compat/mingw.c b/compat/mingw.c index 6097b8f9e6..29d3f09768 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1546,7 +1546,7 @@ static int is_msys2_sh(const char *cmd) return ret; } - if (ends_with(cmd, "\\sh.exe")) { + if (ends_with(cmd, "\\sh.exe") || ends_with(cmd, "/sh.exe")) { static char *sh; if (!sh) diff --git a/compat/win32/path-utils.c b/compat/win32/path-utils.c index ebf2f12eb6..b658ca3f81 100644 --- a/compat/win32/path-utils.c +++ b/compat/win32/path-utils.c @@ -1,4 +1,5 @@ #include "../../git-compat-util.h" +#include "../../environment.h" int win32_has_dos_drive_prefix(const char *path) { @@ -50,3 +51,39 @@ int win32_offset_1st_component(const char *path) return pos + is_dir_sep(*pos) - path; } + +int win32_fspathncmp(const char *a, const char *b, size_t count) +{ + int diff; + + for (;;) { + if (!count--) + return 0; + if (!*a) + return *b ? -1 : 0; + if (!*b) + return +1; + + if (is_dir_sep(*a)) { + if (!is_dir_sep(*b)) + return -1; + a++; + b++; + continue; + } else if (is_dir_sep(*b)) + return +1; + + diff = ignore_case ? + (unsigned char)tolower(*a) - (int)(unsigned char)tolower(*b) : + (unsigned char)*a - (int)(unsigned char)*b; + if (diff) + return diff; + a++; + b++; + } +} + +int win32_fspathcmp(const char *a, const char *b) +{ + return win32_fspathncmp(a, b, (size_t)-1); +} diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h index 65fa3b9263..a561c700e7 100644 --- a/compat/win32/path-utils.h +++ b/compat/win32/path-utils.h @@ -29,5 +29,9 @@ static inline int win32_has_dir_sep(const char *path) #define has_dir_sep(path) win32_has_dir_sep(path) int win32_offset_1st_component(const char *path); #define offset_1st_component win32_offset_1st_component +int win32_fspathcmp(const char *a, const char *b); +#define fspathcmp win32_fspathcmp +int win32_fspathncmp(const char *a, const char *b, size_t count); +#define fspathncmp win32_fspathncmp #endif diff --git a/config.mak.dev b/config.mak.dev index 1ce4c70613..5229c35484 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -10,7 +10,7 @@ endif DEVELOPER_CFLAGS += -Wall ifeq ($(filter no-pedantic,$(DEVOPTS)),) DEVELOPER_CFLAGS += -pedantic -ifneq (($or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),) +ifneq ($(or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),) DEVELOPER_CFLAGS += -Wpedantic ifneq ($(filter gcc10,$(COMPILER_FEATURES)),) ifeq ($(uname_S),MINGW) diff --git a/config.mak.uname b/config.mak.uname index 85d63821ec..aa0fd26bd5 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -8,7 +8,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') -uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') ifneq ($(findstring MINGW,$(uname_S)),) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 2f9c33585c..832f46b316 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -976,11 +976,12 @@ list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") #unit-tests add_library(unit-test-lib OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/test-lib.c) +add_library(unit-test-lib-oid OBJECT ${CMAKE_SOURCE_DIR}/t/unit-tests/lib-oid.c) parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "") foreach(unit_test ${unit_test_PROGRAMS}) add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c") - target_link_libraries("${unit_test}" unit-test-lib common-main) + target_link_libraries("${unit_test}" unit-test-lib unit-test-lib-oid common-main) set_target_properties("${unit_test}" PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) if(MSVC) @@ -95,7 +95,7 @@ int count_slashes(const char *s) return cnt; } -int fspathcmp(const char *a, const char *b) +int git_fspathcmp(const char *a, const char *b) { return ignore_case ? strcasecmp(a, b) : strcmp(a, b); } @@ -105,7 +105,7 @@ int fspatheq(const char *a, const char *b) return !fspathcmp(a, b); } -int fspathncmp(const char *a, const char *b, size_t count) +int git_fspathncmp(const char *a, const char *b, size_t count) { return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count); } @@ -541,9 +541,9 @@ int remove_dir_recursively(struct strbuf *path, int flag); */ int remove_path(const char *path); -int fspathcmp(const char *a, const char *b); +int git_fspathcmp(const char *a, const char *b); int fspatheq(const char *a, const char *b); -int fspathncmp(const char *a, const char *b, size_t count); +int git_fspathncmp(const char *a, const char *b, size_t count); unsigned int fspathhash(const char *str); /* diff --git a/git-compat-util.h b/git-compat-util.h index ca7678a379..71b4d23f03 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -506,6 +506,14 @@ static inline int git_offset_1st_component(const char *path) #define offset_1st_component git_offset_1st_component #endif +#ifndef fspathcmp +#define fspathcmp git_fspathcmp +#endif + +#ifndef fspathncmp +#define fspathncmp git_fspathncmp +#endif + #ifndef is_valid_path #define is_valid_path(path) 1 #endif diff --git a/git-send-email.perl b/git-send-email.perl index f0be4b4560..72044e5ef3 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1847,9 +1847,9 @@ sub pre_process_file { $what, $_) unless $quiet; next; } - push @cc, $c; + push @cc, $sc; printf(__("(body) Adding cc: %s from line '%s'\n"), - $c, $_) unless $quiet; + $sc, $_) unless $quiet; } } close $fh; diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index ccd14e0e30..b09a8d0523 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -8326,10 +8326,10 @@ XML my %co = %{$commitlist[$i]}; my $commit = $co{'id'}; # we read 150, we always show 30 and the ones more recent than 48 hours - if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) { + if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) { last; } - my %cd = parse_date($co{'author_epoch'}, $co{'author_tz'}); + my %cd = parse_date($co{'committer_epoch'}, $co{'committer_tz'}); # get list of changed files open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, @@ -108,12 +108,19 @@ static struct { }; #endif +enum proactive_auth { + PROACTIVE_AUTH_NONE = 0, + PROACTIVE_AUTH_IF_CREDENTIALS, + PROACTIVE_AUTH_AUTO, + PROACTIVE_AUTH_BASIC, +}; + static struct credential proxy_auth = CREDENTIAL_INIT; static const char *curl_proxyuserpwd; static char *curl_cookie_file; static int curl_save_cookies; struct credential http_auth = CREDENTIAL_INIT; -static int http_proactive_auth; +static enum proactive_auth http_proactive_auth; static char *user_agent; static int curl_empty_auth = -1; @@ -148,6 +155,12 @@ static int http_schannel_check_revoke = 1; */ static int http_schannel_use_ssl_cainfo; +static int always_auth_proactively(void) +{ + return http_proactive_auth != PROACTIVE_AUTH_NONE && + http_proactive_auth != PROACTIVE_AUTH_IF_CREDENTIALS; +} + size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) { size_t size = eltsize * nmemb; @@ -539,6 +552,20 @@ static int http_options(const char *var, const char *value, return 0; } + if (!strcmp("http.proactiveauth", var)) { + if (!value) + return config_error_nonbool(var); + if (!strcmp(value, "auto")) + http_proactive_auth = PROACTIVE_AUTH_AUTO; + else if (!strcmp(value, "basic")) + http_proactive_auth = PROACTIVE_AUTH_BASIC; + else if (!strcmp(value, "none")) + http_proactive_auth = PROACTIVE_AUTH_NONE; + else + warning(_("Unknown value for http.proactiveauth")); + return 0; + } + /* Fall back on the default ones */ return git_default_config(var, value, ctx, data); } @@ -580,14 +607,29 @@ static void init_curl_http_auth(CURL *result) { if ((!http_auth.username || !*http_auth.username) && (!http_auth.credential || !*http_auth.credential)) { - if (curl_empty_auth_enabled()) + int empty_auth = curl_empty_auth_enabled(); + if ((empty_auth != -1 && !always_auth_proactively()) || empty_auth == 1) { curl_easy_setopt(result, CURLOPT_USERPWD, ":"); - return; + return; + } else if (!always_auth_proactively()) { + return; + } else if (http_proactive_auth == PROACTIVE_AUTH_BASIC) { + strvec_push(&http_auth.wwwauth_headers, "Basic"); + } } credential_fill(&http_auth, 1); if (http_auth.password) { + if (always_auth_proactively()) { + /* + * We got a credential without an authtype and we don't + * know what's available. Since our only two options at + * the moment are auto (which defaults to basic) and + * basic, use basic for now. + */ + curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); + } curl_easy_setopt(result, CURLOPT_USERNAME, http_auth.username); curl_easy_setopt(result, CURLOPT_PASSWORD, http_auth.password); } @@ -1050,7 +1092,7 @@ static CURL *get_curl_handle(void) #endif } - if (http_proactive_auth) + if (http_proactive_auth != PROACTIVE_AUTH_NONE) init_curl_http_auth(result); if (getenv("GIT_SSL_VERSION")) @@ -1294,7 +1336,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) die("curl_global_init failed"); - http_proactive_auth = proactive_auth; + if (proactive_auth && http_proactive_auth == PROACTIVE_AUTH_NONE) + http_proactive_auth = PROACTIVE_AUTH_IF_CREDENTIALS; if (remote && remote->http_proxy) curl_http_proxy = xstrdup(remote->http_proxy); @@ -1466,7 +1509,16 @@ struct active_request_slot *get_active_slot(void) slot->finished = NULL; slot->callback_data = NULL; slot->callback_func = NULL; + + if (curl_cookie_file && !strcmp(curl_cookie_file, "-")) { + warning(_("refusing to read cookies from http.cookiefile '-'")); + FREE_AND_NULL(curl_cookie_file); + } curl_easy_setopt(slot->curl, CURLOPT_COOKIEFILE, curl_cookie_file); + if (curl_save_cookies && (!curl_cookie_file || !curl_cookie_file[0])) { + curl_save_cookies = 0; + warning(_("ignoring http.savecookies for empty http.cookiefile")); + } if (curl_save_cookies) curl_easy_setopt(slot->curl, CURLOPT_COOKIEJAR, curl_cookie_file); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header); @@ -1790,6 +1842,8 @@ static int handle_curl_result(struct slot_results *results) return HTTP_REAUTH; } credential_reject(&http_auth); + if (always_auth_proactively()) + http_proactive_auth = PROACTIVE_AUTH_NONE; return HTTP_NOAUTH; } else { http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE; @@ -2186,7 +2240,12 @@ static int http_request_reauth(const char *url, struct http_get_options *options) { int i = 3; - int ret = http_request(url, result, target, options); + int ret; + + if (always_auth_proactively()) + credential_fill(&http_auth, 1); + + ret = http_request(url, result, target, options); if (ret != HTTP_OK && ret != HTTP_REAUTH) return ret; diff --git a/log-tree.c b/log-tree.c index 52feec4356..576ef30d90 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1025,7 +1025,7 @@ static int do_remerge_diff(struct rev_info *opt, struct strbuf parent2_desc = STRBUF_INIT; /* Setup merge options */ - init_merge_options(&o, the_repository); + init_ui_merge_options(&o, the_repository); o.show_rename_progress = 0; o.record_conflict_msgs_as_headers = 1; o.msg_header_prefix = "remerge"; diff --git a/merge-ort.c b/merge-ort.c index ffbdb8fc8e..e9d01ac7f7 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -545,17 +545,35 @@ enum conflict_and_info_types { CONFLICT_SUBMODULE_HISTORY_NOT_AVAILABLE, CONFLICT_SUBMODULE_MAY_HAVE_REWINDS, CONFLICT_SUBMODULE_NULL_MERGE_BASE, - CONFLICT_SUBMODULE_CORRUPT, + + /* INSERT NEW ENTRIES HERE */ + + /* + * Keep this entry after all regular conflict and info types; only + * errors (failures causing immediate abort of the merge) should + * come after this. + */ + NB_REGULAR_CONFLICT_TYPES, + + /* + * Something is seriously wrong; cannot even perform merge; + * Keep this group _last_ other than NB_TOTAL_TYPES + */ + ERROR_SUBMODULE_CORRUPT, + ERROR_THREEWAY_CONTENT_MERGE_FAILED, + ERROR_OBJECT_WRITE_FAILED, + ERROR_OBJECT_READ_FAILED, + ERROR_OBJECT_NOT_A_BLOB, /* Keep this entry _last_ in the list */ - NB_CONFLICT_TYPES, + NB_TOTAL_TYPES, }; /* * Short description of conflict type, relied upon by external tools. * * We can add more entries, but DO NOT change any of these strings. Also, - * Order MUST match conflict_info_and_types. + * please ensure the order matches what is used in conflict_info_and_types. */ static const char *type_short_descriptions[] = { /*** "Simple" conflicts and informational messages ***/ @@ -599,8 +617,18 @@ static const char *type_short_descriptions[] = { "CONFLICT (submodule may have rewinds)", [CONFLICT_SUBMODULE_NULL_MERGE_BASE] = "CONFLICT (submodule lacks merge base)", - [CONFLICT_SUBMODULE_CORRUPT] = - "CONFLICT (submodule corrupt)" + + /* Something is seriously wrong; cannot even perform merge */ + [ERROR_SUBMODULE_CORRUPT] = + "ERROR (submodule corrupt)", + [ERROR_THREEWAY_CONTENT_MERGE_FAILED] = + "ERROR (three-way content merge failed)", + [ERROR_OBJECT_WRITE_FAILED] = + "ERROR (object write failed)", + [ERROR_OBJECT_READ_FAILED] = + "ERROR (object read failed)", + [ERROR_OBJECT_NOT_A_BLOB] = + "ERROR (object is not a blob)", }; struct logical_conflict_info { @@ -764,7 +792,8 @@ static void path_msg(struct merge_options *opt, /* Sanity checks */ assert(omittable_hint == - !starts_with(type_short_descriptions[type], "CONFLICT") || + (!starts_with(type_short_descriptions[type], "CONFLICT") && + !starts_with(type_short_descriptions[type], "ERROR")) || type == CONFLICT_DIR_RENAME_SUGGESTED); if (opt->record_conflict_msgs_as_headers && omittable_hint) return; /* Do not record mere hints in headers */ @@ -1819,9 +1848,9 @@ static int merge_submodule(struct merge_options *opt, /* check whether both changes are forward */ ret2 = repo_in_merge_bases(&subrepo, commit_o, commit_a); if (ret2 < 0) { - path_msg(opt, CONFLICT_SUBMODULE_CORRUPT, 0, + path_msg(opt, ERROR_SUBMODULE_CORRUPT, 0, path, NULL, NULL, NULL, - _("Failed to merge submodule %s " + _("error: failed to merge submodule %s " "(repository corrupt)"), path); ret = -1; @@ -1830,9 +1859,9 @@ static int merge_submodule(struct merge_options *opt, if (ret2 > 0) ret2 = repo_in_merge_bases(&subrepo, commit_o, commit_b); if (ret2 < 0) { - path_msg(opt, CONFLICT_SUBMODULE_CORRUPT, 0, + path_msg(opt, ERROR_SUBMODULE_CORRUPT, 0, path, NULL, NULL, NULL, - _("Failed to merge submodule %s " + _("error: failed to merge submodule %s " "(repository corrupt)"), path); ret = -1; @@ -1850,9 +1879,9 @@ static int merge_submodule(struct merge_options *opt, /* Case #1: a is contained in b or vice versa */ ret2 = repo_in_merge_bases(&subrepo, commit_a, commit_b); if (ret2 < 0) { - path_msg(opt, CONFLICT_SUBMODULE_CORRUPT, 0, + path_msg(opt, ERROR_SUBMODULE_CORRUPT, 0, path, NULL, NULL, NULL, - _("Failed to merge submodule %s " + _("error: failed to merge submodule %s " "(repository corrupt)"), path); ret = -1; @@ -1869,9 +1898,9 @@ static int merge_submodule(struct merge_options *opt, } ret2 = repo_in_merge_bases(&subrepo, commit_b, commit_a); if (ret2 < 0) { - path_msg(opt, CONFLICT_SUBMODULE_CORRUPT, 0, + path_msg(opt, ERROR_SUBMODULE_CORRUPT, 0, path, NULL, NULL, NULL, - _("Failed to merge submodule %s " + _("error: failed to merge submodule %s " "(repository corrupt)"), path); ret = -1; @@ -1903,9 +1932,9 @@ static int merge_submodule(struct merge_options *opt, &merges); switch (parent_count) { case -1: - path_msg(opt, CONFLICT_SUBMODULE_CORRUPT, 0, + path_msg(opt, ERROR_SUBMODULE_CORRUPT, 0, path, NULL, NULL, NULL, - _("Failed to merge submodule %s " + _("error: failed to merge submodule %s " "(repository corrupt)"), path); ret = -1; @@ -2111,7 +2140,7 @@ static int handle_content_merge(struct merge_options *opt, * merges, which happens for example with rename/rename(2to1) and * rename/add conflicts. */ - unsigned clean = 1; + int clean = 1; /* * handle_content_merge() needs both files to be of the same type, i.e. @@ -2175,18 +2204,28 @@ static int handle_content_merge(struct merge_options *opt, pathnames, extra_marker_size, &result_buf); - if ((merge_status < 0) || !result_buf.ptr) - ret = error(_("failed to execute internal merge")); + if ((merge_status < 0) || !result_buf.ptr) { + path_msg(opt, ERROR_THREEWAY_CONTENT_MERGE_FAILED, 0, + pathnames[0], pathnames[1], pathnames[2], NULL, + _("error: failed to execute internal merge for %s"), + path); + ret = -1; + } if (!ret && write_object_file(result_buf.ptr, result_buf.size, - OBJ_BLOB, &result->oid)) - ret = error(_("unable to add %s to database"), path); - + OBJ_BLOB, &result->oid)) { + path_msg(opt, ERROR_OBJECT_WRITE_FAILED, 0, + pathnames[0], pathnames[1], pathnames[2], NULL, + _("error: unable to add %s to database"), path); + ret = -1; + } free(result_buf.ptr); + if (ret) return -1; - clean &= (merge_status == 0); + if (merge_status > 0) + clean = 0; path_msg(opt, INFO_AUTO_MERGING, 1, path, NULL, NULL, NULL, _("Auto-merging %s"), path); } else if (S_ISGITLINK(a->mode)) { @@ -2194,6 +2233,8 @@ static int handle_content_merge(struct merge_options *opt, clean = merge_submodule(opt, pathnames[0], two_way ? null_oid() : &o->oid, &a->oid, &b->oid, &result->oid); + if (clean < 0) + return -1; if (opt->priv->call_depth && two_way && !clean) { result->mode = o->mode; oidcpy(&result->oid, &o->oid); @@ -3559,18 +3600,27 @@ static int sort_dirs_next_to_their_children(const char *one, const char *two) return c1 - c2; } -static int read_oid_strbuf(const struct object_id *oid, - struct strbuf *dst) +static int read_oid_strbuf(struct merge_options *opt, + const struct object_id *oid, + struct strbuf *dst, + const char *path) { void *buf; enum object_type type; unsigned long size; buf = repo_read_object_file(the_repository, oid, &type, &size); - if (!buf) - return error(_("cannot read object %s"), oid_to_hex(oid)); + if (!buf) { + path_msg(opt, ERROR_OBJECT_READ_FAILED, 0, + path, NULL, NULL, NULL, + _("error: cannot read object %s"), oid_to_hex(oid)); + return -1; + } if (type != OBJ_BLOB) { free(buf); - return error(_("object %s is not a blob"), oid_to_hex(oid)); + path_msg(opt, ERROR_OBJECT_NOT_A_BLOB, 0, + path, NULL, NULL, NULL, + _("error: object %s is not a blob"), oid_to_hex(oid)); + return -1; } strbuf_attach(dst, buf, size, size + 1); return 0; @@ -3594,8 +3644,8 @@ static int blob_unchanged(struct merge_options *opt, if (oideq(&base->oid, &side->oid)) return 1; - if (read_oid_strbuf(&base->oid, &basebuf) || - read_oid_strbuf(&side->oid, &sidebuf)) + if (read_oid_strbuf(opt, &base->oid, &basebuf, path) || + read_oid_strbuf(opt, &side->oid, &sidebuf, path)) goto error_return; /* * Note: binary | is used so that both renormalizations are @@ -4645,6 +4695,7 @@ void merge_display_update_messages(struct merge_options *opt, struct hashmap_iter iter; struct strmap_entry *e; struct string_list olist = STRING_LIST_INIT_NODUP; + FILE *o = stdout; if (opt->record_conflict_msgs_as_headers) BUG("Either display conflict messages or record them as headers, not both"); @@ -4661,6 +4712,10 @@ void merge_display_update_messages(struct merge_options *opt, } string_list_sort(&olist); + /* Print to stderr if we hit errors rather than just conflicts */ + if (result->clean < 0) + o = stderr; + /* Iterate over the items, printing them */ for (int path_nr = 0; path_nr < olist.nr; ++path_nr) { struct string_list *conflicts = olist.items[path_nr].util; @@ -4668,25 +4723,31 @@ void merge_display_update_messages(struct merge_options *opt, struct logical_conflict_info *info = conflicts->items[i].util; + /* On failure, ignore regular conflict types */ + if (result->clean < 0 && + info->type < NB_REGULAR_CONFLICT_TYPES) + continue; + if (detailed) { - printf("%lu", (unsigned long)info->paths.nr); - putchar('\0'); + fprintf(o, "%lu", (unsigned long)info->paths.nr); + fputc('\0', o); for (int n = 0; n < info->paths.nr; n++) { - fputs(info->paths.v[n], stdout); - putchar('\0'); + fputs(info->paths.v[n], o); + fputc('\0', o); } - fputs(type_short_descriptions[info->type], - stdout); - putchar('\0'); + fputs(type_short_descriptions[info->type], o); + fputc('\0', o); } - puts(conflicts->items[i].string); + fputs(conflicts->items[i].string, o); + fputc('\n', o); if (detailed) - putchar('\0'); + fputc('\0', o); } } string_list_clear(&olist, 0); - print_submodule_conflict_suggestion(&opti->conflicted_submodules); + if (result->clean >= 0) + print_submodule_conflict_suggestion(&opti->conflicted_submodules); /* Also include needed rename limit adjustment now */ diff_warn_rename_limit("merge.renamelimit", @@ -5002,6 +5063,26 @@ static void merge_check_renames_reusable(struct merge_result *result, /*** Function Grouping: merge_incore_*() and their internal variants ***/ +static void move_opt_priv_to_result_priv(struct merge_options *opt, + struct merge_result *result) +{ + /* + * opt->priv and result->priv are a bit weird. opt->priv contains + * information that we can re-use in subsequent merge operations to + * enable our cached renames optimization. The best way to provide + * that to subsequent merges is putting it in result->priv. + * However, putting it directly there would mean retrofitting lots + * of functions in this file to also take a merge_result pointer, + * which is ugly and annoying. So, we just make sure at the end of + * the merge (the outer merge if there are internal recursive ones) + * to move it. + */ + assert(opt->priv && !result->priv); + result->priv = opt->priv; + result->_properly_initialized = RESULT_INITIALIZED; + opt->priv = NULL; +} + /* * Originally from merge_trees_internal(); heavily adapted, though. */ @@ -5032,6 +5113,7 @@ redo: oid_to_hex(&side1->object.oid), oid_to_hex(&side2->object.oid)); result->clean = -1; + move_opt_priv_to_result_priv(opt, result); return; } trace2_region_leave("merge", "collect_merge_info", opt->repo); @@ -5062,11 +5144,8 @@ redo: /* existence of conflicted entries implies unclean */ result->clean &= strmap_empty(&opt->priv->conflicted); } - if (!opt->priv->call_depth) { - result->priv = opt->priv; - result->_properly_initialized = RESULT_INITIALIZED; - opt->priv = NULL; - } + if (!opt->priv->call_depth || result->clean < 0) + move_opt_priv_to_result_priv(opt, result); } /* diff --git a/merge-recursive.c b/merge-recursive.c index 5cc638066a..ed64a4c537 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3921,7 +3921,7 @@ int merge_recursive_generic(struct merge_options *opt, return clean ? 0 : 1; } -static void merge_recursive_config(struct merge_options *opt) +static void merge_recursive_config(struct merge_options *opt, int ui) { char *value = NULL; int renormalize = 0; @@ -3950,11 +3950,20 @@ static void merge_recursive_config(struct merge_options *opt) } /* avoid erroring on values from future versions of git */ free(value); } + if (ui) { + if (!git_config_get_string("diff.algorithm", &value)) { + long diff_algorithm = parse_algorithm_value(value); + if (diff_algorithm < 0) + die(_("unknown value for config '%s': %s"), "diff.algorithm", value); + opt->xdl_opts = (opt->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | diff_algorithm; + free(value); + } + } git_config(git_xmerge_config, NULL); } -void init_merge_options(struct merge_options *opt, - struct repository *repo) +static void init_merge_options(struct merge_options *opt, + struct repository *repo, int ui) { const char *merge_verbosity; memset(opt, 0, sizeof(struct merge_options)); @@ -3973,7 +3982,7 @@ void init_merge_options(struct merge_options *opt, opt->conflict_style = -1; - merge_recursive_config(opt); + merge_recursive_config(opt, ui); merge_verbosity = getenv("GIT_MERGE_VERBOSITY"); if (merge_verbosity) opt->verbosity = strtol(merge_verbosity, NULL, 10); @@ -3981,6 +3990,18 @@ void init_merge_options(struct merge_options *opt, opt->buffer_output = 0; } +void init_ui_merge_options(struct merge_options *opt, + struct repository *repo) +{ + init_merge_options(opt, repo, 1); +} + +void init_basic_merge_options(struct merge_options *opt, + struct repository *repo) +{ + init_merge_options(opt, repo, 0); +} + /* * For now, members of merge_options do not need deep copying, but * it may change in the future, in which case we would need to update diff --git a/merge-recursive.h b/merge-recursive.h index 3136c7cc2d..0b91f28f90 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -54,7 +54,10 @@ struct merge_options { struct merge_options_internal *priv; }; -void init_merge_options(struct merge_options *opt, struct repository *repo); +/* for use by porcelain commands */ +void init_ui_merge_options(struct merge_options *opt, struct repository *repo); +/* for use by plumbing commands */ +void init_basic_merge_options(struct merge_options *opt, struct repository *repo); void copy_merge_options(struct merge_options *dst, struct merge_options *src); void clear_merge_options(struct merge_options *opt); diff --git a/midx-write.c b/midx-write.c index 478b42e720..a77ee73c68 100644 --- a/midx-write.c +++ b/midx-write.c @@ -1499,8 +1499,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset); repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands); - strvec_pushl(&cmd.args, "pack-objects", "--stdin-packs", "--non-empty", - NULL); + strvec_push(&cmd.args, "pack-objects"); strvec_pushf(&cmd.args, "%s/pack/pack", object_dir); @@ -1524,15 +1523,16 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, } cmd_in = xfdopen(cmd.in, "w"); - for (i = 0; i < m->num_packs; i++) { - struct packed_git *p = m->packs[i]; - if (!p) + + for (i = 0; i < m->num_objects; i++) { + struct object_id oid; + uint32_t pack_int_id = nth_midxed_pack_int_id(m, i); + + if (!include_pack[pack_int_id]) continue; - if (include_pack[i]) - fprintf(cmd_in, "%s\n", pack_basename(p)); - else - fprintf(cmd_in, "^%s\n", pack_basename(p)); + nth_midxed_object_oid(&oid, m, i); + fprintf(cmd_in, "%s\n", oid_to_hex(&oid)); } fclose(cmd_in); @@ -218,8 +218,10 @@ # symref файл Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» (regular file that stores a string that begins with ref: refs/) # human-readable четим от хора # pseudoref пÑевдоуказател, напр. MERGE_HEAD, CHERRY_PICK_HEAD, REVERT_HEAD или REBASE_HEAD +# pseudo-merge пÑевдо Ñливанe # reftable таблица Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ð¸ # its referent '%s' ÑÐ¾Ñ‡ÐµÑ‰Ð¸Ñ Ð³Ð¾ „%s“ +# dry run пробно изпълнение # # # ------------------------ @@ -249,8 +251,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.45\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-21 16:59+0200\n" -"PO-Revision-Date: 2024-04-21 17:00+0200\n" +"POT-Creation-Date: 2024-07-20 07:37+0200\n" +"PO-Revision-Date: 2024-07-21 22:27+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -820,6 +822,10 @@ msgstr "" "p — извеждане на текущото парче\n" "? — извеждане на помощта\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Очаква Ñе Ñамо един знак, а не „%s“" + msgid "No previous hunk" msgstr "ÐÑма друго парче преди това" @@ -868,9 +874,19 @@ msgstr "РазделÑне на %d парчета." msgid "Sorry, cannot edit this hunk" msgstr "Това парче не може да Ñе редактира" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Ðепозната команда „%s“ (за помощ натиÑнете „?“)" + msgid "'git apply' failed" msgstr "неуÑпешно изпълнение на „git apply“" +msgid "No changes." +msgstr "ÐÑма промѐни." + +msgid "Only binary files changed." +msgstr "Променени Ñа Ñамо двоични файлове." + #, c-format msgid "" "\n" @@ -1399,10 +1415,6 @@ msgstr[0] "Прилагане на кръпката „%%s“ Ñ %d отхвър msgstr[1] "Прилагане на кръпката „%%s“ Ñ %d отхвърлени парчета…" #, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "Ñъкращаване на името на файла Ñ Ð¾Ñ‚Ñ…Ð²ÑŠÑ€Ð»ÐµÐ½Ð¸Ñ‚Ðµ парчета на „%.*s.rej“" - -#, c-format msgid "cannot open %s" msgstr "„%s“ не може да Ñе отвори" @@ -1752,6 +1764,10 @@ msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ñ„Ð°Ð¹Ð» зРmsgid "ignoring overly large gitattributes blob '%s'" msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-BLOB за атрибути на git: „%s“" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "" +"опциÑта „--attr-source“ и променливата „GIT_ATTR_SOURCE“ изиÑкват хранилище" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "" "неправилна ÑтойноÑÑ‚ за опциÑта „--attr-source“ или променливата " @@ -1834,6 +1850,10 @@ msgid "could not create file '%s'" msgstr "файлът „%s“ не може да Ñе Ñъздаде" #, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "дейÑтвието „show“ не може да Ñе изпълни за обект „%s“" + +#, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да Ñе прочете" @@ -2072,13 +2092,6 @@ msgstr "права̀та на „%2$s“ не може да Ñе зададат msgid "Unstaged changes after refreshing the index:" msgstr "Промѐни, които и Ñлед обновÑването на индекÑа не Ñа добавени към него:" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"ÐаÑтройката „add.interactive.useBuiltin“ е премахната!\n" -"За подробноÑти Ñ Ð¿Ð¾Ñ‚ÑŠÑ€Ñете в изхода от „git help config“." - msgid "could not read the index" msgstr "индекÑÑŠÑ‚ не може да Ñе прочете" @@ -2541,6 +2554,9 @@ msgstr "" msgid "show the patch being applied" msgstr "показване на прилаганата кръпка" +msgid "try to apply current patch again" +msgstr "нов опит за прилагане на текущата кръпка" + msgid "record the empty patch as an empty commit" msgstr "прилагане на празна кръпка като празно подаване" @@ -2598,9 +2614,6 @@ msgstr "git apply [ОПЦИЯ…] [КРЪПКÐ…]" msgid "could not redirect output" msgstr "изходът не може да Ñе пренаÑочи" -msgid "git archive: Remote with no URL" -msgstr "git archive: ЛипÑва Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "" "git archive: очакваше Ñе „ACK“/„NAK“, а бе получен изчиÑтващ пакет „flush“" @@ -3535,6 +3548,9 @@ msgstr "За Ñъздаването на пратка е необходимо Ñ… msgid "do not show bundle details" msgstr "без подробна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° пратките" +msgid "need a repository to verify a bundle" +msgstr "за проверката на пратка е необходимо хранилище" + #, c-format msgid "%s is okay\n" msgstr "Пратката „%s“ е наред\n" @@ -4410,9 +4426,7 @@ msgid "remove only ignored files" msgstr "изтриване Ñамо на игнорирани файлове" msgid "clean.requireForce is true and -f not given: refusing to clean" -msgstr "" -"ÐаÑтройката „clean.requireForce“ е зададена, което изиÑква опцииÑта „-f“. " -"ÐÑма да Ñе извърши изчиÑтване" +msgstr "ÐаÑтройката „clean.requireForce“ е зададена, което изиÑква опциÑта „-f“. ÐÑма да Ñе извърши изчиÑтване" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРÐÐИЛИЩЕ [ДИРЕКТОРИЯ]" @@ -4569,6 +4583,14 @@ msgid "failed to unlink '%s'" msgstr "неуÑпешно изтриване на „%s“" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "твърдата връзка не може да Ñе провери при „%s“" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "твърдата връзка е различна от източника „%s“" + +#, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде Ñъздадена" @@ -5438,15 +5460,49 @@ msgstr "" "\n" " git restore --staged :/" -msgid "git config [<options>]" -msgstr "git config [ОПЦИЯ…]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [ОПЦИЯ_ЗÐ_ФÐЙЛ] [ОПЦИЯ_ЗÐ_ИЗВЕЖДÐÐЕ] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "непознат аргумент към „--type“: %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [ОПЦИЯ_ЗÐ_ФÐЙЛ] [ОПЦИЯ_ЗÐ_ИЗВЕЖДÐÐЕ] [--includes] [--all] [--" +"regexp=РЕГ_ИЗР][--value=СТОЙÐОСТ] [--fixed-value] [--default=СТÐÐДÐРТÐО] ИМЕ" -msgid "only one type at a time" -msgstr "Ñамо по един вид" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [ОПЦИЯ_ЗÐ_ФÐЙЛ] [--type=ВИД] [--all] [--value=СТОЙÐОСТ] [--" +"fixed-value] ИМЕ СТОЙÐОСТ" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [ОПЦИЯ_ЗÐ_ФÐЙЛ] [--all] [--value=СТОЙÐОСТ] [--fixed-value]" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [ОПЦИЯ_ЗÐ_ФÐЙЛ] СТÐРО_ИМЕ ÐОВО_ИМЕ" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [ОПЦИЯ_ЗÐ_ФÐЙЛ] ИМЕ" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [ОПЦИЯ_ЗÐ_ФÐЙЛ]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "" +"git config [ОПЦИЯ_ЗÐ_ФÐЙЛ] --get-colorbool ИМЕ [СТÐÐД_ИЗХОД_ÐÐ_ТЕРМИÐÐЛ]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [ОПЦИЯ_ЗÐ_ФÐЙЛ] [--type=ВИД] [--comment=СЪОБЩЕÐИЕ] [--all] [--" +"value=СТОЙÐОСТ] [--fixed-value] ИМЕ СТОЙÐОСТ" msgid "Config file location" msgstr "МеÑтоположение на ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»" @@ -5473,57 +5529,6 @@ msgid "read config from given blob object" msgstr "" "изчитане на конфигурациÑта от BLOB Ñ Ñ‚Ð¾Ð·Ð¸ ИДЕÐТИФИКÐТОРна Ñъдържанието" -msgid "Action" -msgstr "ДейÑтвие" - -msgid "get value: name [value-pattern]" -msgstr "извеждане на ÑтойноÑÑ‚: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "get all values: key [value-pattern]" -msgstr "извеждане на вÑички ÑтойноÑти: ключ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "" -"извеждане на ÑтойноÑтите за РЕГУЛЯРÐиÑ_ИЗРÐЗ: РЕГУЛЯРЕÐ_ИЗРÐЗ_ЗÐ_ИМЕТО " -"[ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "извеждане на ÑтойноÑтта за ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑ: Ð ÐЗДЕЛ[.ПРОМЕÐЛИВÐ] ÐДРЕС" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "" -"замÑна на вÑички Ñъвпадащи променливи: ИМЕ СТОЙÐОСТ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "add a new variable: name value" -msgstr "добавÑне на нова променлива: ИМЕ СТОЙÐОСТ" - -msgid "remove a variable: name [value-pattern]" -msgstr "изтриване на променлива: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "remove all matches: name [value-pattern]" -msgstr "изтриване на вÑички Ñъвпадащи: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" - -msgid "rename section: old-name new-name" -msgstr "преименуване на раздел: СТÐРО_ИМЕ ÐОВО_ИМЕ" - -msgid "remove a section: name" -msgstr "изтриване на раздел: ИМЕ" - -msgid "list all" -msgstr "изброÑване на вÑички" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "доÑловно равенÑтво при ÑравнÑване ÑÑŠÑ Ð¨ÐБЛОÐ_ЗÐ_СТОЙÐОСТ" - -msgid "open an editor" -msgstr "отварÑне на редактор" - -msgid "find the color configured: slot [default]" -msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [Ñтандартно]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер (ÑтандартниÑÑ‚ изход е терминал)" - msgid "Type" msgstr "Вид" @@ -5551,8 +5556,8 @@ msgstr "СТОЙÐОСТТРе път (до файл или Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ msgid "value is an expiry date" msgstr "ÑтойноÑтта е период на валидноÑÑ‚/запазване" -msgid "Other" -msgstr "Други" +msgid "Display options" +msgstr "Опции за извеждането" msgid "terminate values with NUL byte" msgstr "разделÑне на ÑтойноÑтите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" @@ -5560,9 +5565,6 @@ msgstr "разделÑне на ÑтойноÑтите Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ð msgid "show variable names only" msgstr "извеждане на имената на променливите" -msgid "respect include directives on lookup" -msgstr "при Ñ‚ÑŠÑ€Ñене да Ñе уважат и директивите за включване" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "извеждане на мÑÑтото на задаване на наÑтройката (файл, Ñтандартен вход, " @@ -5573,14 +5575,15 @@ msgstr "" "извеждане на обхвата на наÑтройката „worktree“ (работно дърво), „local“ " "(хранилище), „global“ (потребител), „system“ (ÑиÑтема), „command“ (команда)" -msgid "value" -msgstr "СТОЙÐОСТ" +msgid "show config keys in addition to their values" +msgstr "извеждане на ключовете в наÑтройките заедно ÑÑŠÑ ÑтойноÑтите им" -msgid "with --get, use default value when missing entry" -msgstr "Ñ â€ž--get“ Ñе използва Ñтандартна СТОЙÐОСТ при липÑваща" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "непознат аргумент към „--type“: %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "низ за подаване четим от хора (при нужда отпред Ñе Ð´Ð¾Ð±Ð°Ð²Ñ â€ž#“)" +msgid "only one type at a time" +msgstr "Ñамо по един вид" #, c-format msgid "wrong number of arguments, should be %d" @@ -5657,50 +5660,73 @@ msgstr "" "повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¸Ð¶Ñ‚Ðµ раздела „CONFIGURATION FILE“ в\n" "„git help worktree“" -msgid "--get-color and variable type are incoherent" -msgstr "опциÑта „--get-color“ не ÑъответÑтва на вида на променливата" +msgid "Other" +msgstr "Други" -msgid "only one action at a time" -msgstr "Ñамо по едно дейÑтвие" +msgid "respect include directives on lookup" +msgstr "при Ñ‚ÑŠÑ€Ñене да Ñе уважат и директивите за включване" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "" -"опциÑта „--name-only“ е приложима Ñамо към опциите „--list“ и „--get-regexp“" +#, c-format +msgid "unable to read config file '%s'" +msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде прочетен" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"опциÑта „--show-origin“ е приложима Ñамо към опциите „--get“, „--get-all“, " -"„--get-regexp“ и „--list“" +msgid "error processing config file(s)" +msgstr "грешка при обработката на конфигурационен файл" -msgid "--default is only applicable to --get" -msgstr "опциÑта „--default“ е приложима Ñамо към опциÑта „--get“" +msgid "Filter options" +msgstr "Опции за филтриране" -msgid "--comment is only applicable to add/set/replace operations" +msgid "return all values for multi-valued config options" +msgstr "връщане на вÑички ÑтойноÑти за опциите, поддържащи много ÑтойноÑти" + +msgid "interpret the name as a regular expression" +msgstr "третиране на името като регулÑрен израз" + +msgid "show config with values matching the pattern" +msgstr "извеждане на наÑтройките ÑÑŠÑ ÑтойноÑти напаÑващи на ШÐБЛОÐа" + +msgid "use string equality when comparing values to value pattern" msgstr "" -"опциÑта „--comment“ е ÑъвмеÑтима Ñамо Ñ Ð´ÐµÐ¹ÑтвиÑта „add“ (добавÑне)/„set“ " -"(задаване)/„replace“ (замÑна)" +"ползване на равенÑтво на низ при ÑравнÑване на ÑтойноÑÑ‚ Ñ Ð¨ÐБЛОÐ_ЗÐ_СТОЙÐОСТ" + +msgid "URL" +msgstr "ÐдреÑ" + +msgid "show config matching the given URL" +msgstr "извеждане на наÑтройките напаÑващи на Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð°Ð´Ñ€ÐµÑ" + +msgid "value" +msgstr "СТОЙÐОСТ" + +msgid "use default value when missing entry" +msgstr "ползване на Ñтандартна СТОЙÐОСТ при липÑваща" msgid "--fixed-value only applies with 'value-pattern'" -msgstr "опциÑта „--fixed-value“ е приложима Ñамо ÑÑŠÑ Ð¨ÐБЛОÐ_ЗÐ_СТОЙÐОСТ" +msgstr "опциÑта „--fixed-value“ изиÑква ШÐБЛОÐ_ЗÐ_СТОЙÐОСТ" -#, c-format -msgid "unable to read config file '%s'" -msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде прочетен" +msgid "--default= cannot be used with --all or --url=" +msgstr "опциÑта „--default=“ е неÑъвмеÑтима Ñ â€ž--all“, „--url=“" -msgid "error processing config file(s)" -msgstr "грешка при обработката на конфигурационен файл" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "опциÑта „--url=“ е неÑъвмеÑтима Ñ â€ž--all“, „--regexp“, „--value“" -msgid "editing stdin is not supported" -msgstr "не Ñе поддържа редактиране на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" +msgid "Filter" +msgstr "Филтриране" -msgid "editing blobs is not supported" -msgstr "не Ñе поддържа редактиране на обекти-BLOB" +msgid "replace multi-valued config option with new value" +msgstr "замÑна на наÑтройка, приемаща много ÑтойноÑти, Ñ Ð½Ð¾Ð²Ð° ÑтойноÑÑ‚" -#, c-format -msgid "cannot create configuration file %s" -msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде Ñъздаден" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "низ за подаване четим от хора (при нужда отпред Ñе Ð´Ð¾Ð±Ð°Ð²Ñ â€ž#“)" + +msgid "add a new line without altering any existing values" +msgstr "добавÑне на нов ред без промÑна на ÑъщеÑтвуващи ÑтойноÑти" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "опциÑта „--fixed-value“ изиÑква опциÑта „--value=ШÐБЛОÐ_ЗÐ_СТОЙÐОСТ“" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "опциитe „--append“ и „--value=ШÐБЛОÐ_ЗÐ_СТОЙÐОСТ“ Ñа неÑъвмеÑтими" #, c-format msgid "" @@ -5715,6 +5741,92 @@ msgstr "" msgid "no such section: %s" msgstr "такъв раззел нÑма: %s" +msgid "editing stdin is not supported" +msgstr "не Ñе поддържа редактиране на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" + +msgid "editing blobs is not supported" +msgstr "не Ñе поддържа редактиране на обекти-BLOB" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "конфигурационниÑÑ‚ файл „%s“ не може да бъде Ñъздаден" + +msgid "Action" +msgstr "ДейÑтвие" + +msgid "get value: name [<value-pattern>]" +msgstr "извеждане на ÑтойноÑÑ‚: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "get all values: key [<value-pattern>]" +msgstr "извеждане на вÑички ÑтойноÑти: ключ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "" +"извеждане на ÑтойноÑтите за РЕГУЛЯРÐиÑ_ИЗРÐЗ: name-regex " +"[ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "извеждане на ÑтойноÑтта за ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´Ñ€ÐµÑ: Ð ÐЗДЕЛ[.ПРОМЕÐЛИВÐ] ÐДРЕС" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "" +"замÑна на вÑички Ñъвпадащи променливи: ИМЕ СТОЙÐОСТ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "add a new variable: name value" +msgstr "добавÑне на нова променлива: ИМЕ СТОЙÐОСТ" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "изтриване на променлива: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "изтриване на вÑички Ñъвпадащи: ИМЕ [ШÐБЛОÐ_ЗÐ_СТОЙÐОСТТÐ]" + +msgid "rename section: old-name new-name" +msgstr "преименуване на раздел: СТÐРО_ИМЕ ÐОВО_ИМЕ" + +msgid "remove a section: name" +msgstr "изтриване на раздел: ИМЕ" + +msgid "list all" +msgstr "изброÑване на вÑички" + +msgid "open an editor" +msgstr "отварÑне на редактор" + +msgid "find the color configured: slot [<default>]" +msgstr "намиране на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер [СТÐÐДÐРТÐО]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "извеждане на Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ†Ð²ÑÑ‚: номер (СТÐÐД_ИЗХОД_ÐÐ_ТЕРМИÐÐЛ)" + +msgid "with --get, use default value when missing entry" +msgstr "Ñ â€ž--get“ Ñе използва Ñтандартна СТОЙÐОСТ при липÑваща" + +msgid "--get-color and variable type are incoherent" +msgstr "опциÑта „--get-color“ не ÑъответÑтва на вида на променливата" + +msgid "no action specified" +msgstr "не е зададено дейÑтвие" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" +"опциÑта „--name-only“ е приложима Ñамо към опциите „--list“ и „--get-regexp“" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"опциÑта „--show-origin“ е приложима Ñамо към опциите „--get“, „--get-all“, " +"„--get-regexp“ и „--list“" + +msgid "--default is only applicable to --get" +msgstr "опциÑта „--default“ е приложима Ñамо към опциÑта „--get“" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "" +"опциÑта „--comment“ е ÑъвмеÑтима Ñамо Ñ Ð´ÐµÐ¹ÑтвиÑта „add“ (добавÑне)/„set“ " +"(задаване)/„replace“ (замÑна)" + msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат четим от хора" @@ -6545,7 +6657,7 @@ msgid "read reference patterns from stdin" msgstr "изчитане на шаблоните за указатели от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´" msgid "also include HEAD ref and pseudorefs" -msgstr "включване и на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ както и пÑевдоуказателите" +msgstr "включване и на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€žHEAD“ както и пÑевдо указателите" msgid "unknown arguments supplied with --stdin" msgstr "непознат аргумент към опциÑта „--stdin“" @@ -6559,12 +6671,15 @@ msgstr "наÑтройка" msgid "config key storing a list of repository paths" msgstr "наÑтройка, коÑто Ñъдържа ÑпиÑък Ñ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð° към хранилища" +msgid "keep going even if command fails in a repository" +msgstr "продължаване на дейÑтвието дори и командата да е неуÑпешна в нÑкое хранилище" + msgid "missing --config=<config>" msgstr "липÑва --config=ÐÐСТРОЙКÐ" #, c-format msgid "got bad config --config=%s" -msgstr "получена е неправилена наÑтройка „--config=%s“" +msgstr "получена е неправилна наÑтройка „--config=%s“" msgid "unknown" msgstr "непознат" @@ -8041,8 +8156,11 @@ msgstr "отбелÑзване, че това е N-тата поредна реРmsgid "max length of output filename" msgstr "макÑимална дължина на име на вÑеки пакетен файл" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "използване на „[RFC PATCH]“ вмеÑто „[PATCH]“" +msgid "rfc" +msgstr "ПРЕФИКС" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "добавÑне на този ПРЕФИКС (Ñтандартно е „RFC“) пред „PATCH“" msgid "cover-from-description-mode" msgstr "режим-придружаващо-пиÑмо-по-опиÑание" @@ -8282,7 +8400,7 @@ msgid "show resolve-undo information" msgstr "извеждане на информациÑта за отмÑна на разрешените подаваниÑ" msgid "skip files matching pattern" -msgstr "преÑкачане на файловете напаÑващи ШÐБЛОÐа" +msgstr "преÑкачане на файловете напаÑващи на ШÐБЛОÐа" msgid "read exclude patterns from <file>" msgstr "изчитане на шаблоните за игнориране от ФÐЙЛ" @@ -8325,13 +8443,13 @@ msgstr "" "deduplicate“/„--eol“" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМÐÐДÐ]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=КОМÐÐДÐ]\n" " [-q|--quiet] [--exit-code] [--get-url] [--sort=КЛЮЧ]\n" -" [--symref] [ХРÐÐИЛИЩЕ [ШÐБЛОÐ]]" +" [--symref] [ХРÐÐИЛИЩЕ [ШÐБЛОÐ…]]" msgid "do not print remote URL" msgstr "без извеждане на адреÑите на отдалечените хранилища" @@ -8345,8 +8463,11 @@ msgstr "път към командата „git-upload-pack“ на отдале msgid "limit to tags" msgstr "Ñамо етикетите" -msgid "limit to heads" -msgstr "Ñамо върховете" +msgid "limit to branches" +msgstr "Ñамо клоните" + +msgid "deprecated synonym for --branches" +msgstr "оÑтарÑл Ñиноним на „--branches“" msgid "do not show peeled tags" msgstr "без проÑледÑване на непреките етикети" @@ -9206,10 +9327,6 @@ msgstr "git notes prune [ОПЦИЯ…]" msgid "Write/edit the notes for the following object:" msgstr "ЗапиÑване/редактиране на бележките за ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚:" -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "дейÑтвието „show“ не може да Ñе изпълни за обект „%s“" - msgid "could not read 'show' output" msgstr "изведената Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚ дейÑтвието „show“ не може да Ñе прочете" @@ -11076,6 +11193,22 @@ msgstr "не е указан журнал Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð·Ð° изтриРmsgid "invalid ref format: %s" msgstr "неправилен формат на указател: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=ФОРМÐТ [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "указване на форма̀та за указател, към който да Ñе конвертира" + +msgid "perform a non-destructive dry-run" +msgstr "пробно изпълнение — без промÑна на данни" + +msgid "missing --ref-format=<format>" +msgstr "липÑва опциÑта --ref-format=ФОРМÐТ" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "хранилището вече ползва форма̀та „%s“" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11363,9 +11496,6 @@ msgstr "◠отдалечено хранилище „%s“" msgid " Fetch URL: %s" msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° доÑтавÑне: %s" -msgid "(no URL)" -msgstr "(без адреÑ)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -11374,6 +11504,9 @@ msgstr "(без адреÑ)" msgid " Push URL: %s" msgstr " ÐÐ´Ñ€ÐµÑ Ð·Ð° изтлаÑкване: %s" +msgid "(no URL)" +msgstr "(без адреÑ)" + #, c-format msgid " HEAD branch: %s" msgstr " клон Ñочен от HEAD: %s" @@ -11483,10 +11616,6 @@ msgstr "запитване към адреÑите за изтлаÑкване, msgid "return all URLs" msgstr "извеждане на вÑички адреÑи" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "не е зададен Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище „%s“" - msgid "manipulate push URLs" msgstr "промÑна на адреÑите за изтлаÑкване" @@ -12511,12 +12640,12 @@ msgstr "Ðепознат алгоритъм за контролни Ñуми" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d|--dereference]\n" -" [-s|--hash[=БРОЙ]] [--abbrev[=БРОЙ]] [--tags]\n" -" [--heads] [--] [ШÐБЛОÐ…]" +" [-s|--hash[=БРОЙ]] [--abbrev[=БРОЙ]] [--branches] [--tags]\n" +" [--] [ШÐБЛОÐ…]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -12539,11 +12668,11 @@ msgstr "указателÑÑ‚ не ÑъщеÑтвува" msgid "failed to look up reference" msgstr "Ñоченото от ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð»Ð¸Ð¿Ñва" -msgid "only show tags (can be combined with heads)" -msgstr "извеждане на етикетите (може да Ñе комбинира Ñ Ð²ÑŠÑ€Ñ…Ð¾Ð²ÐµÑ‚Ðµ)" +msgid "only show tags (can be combined with branches)" +msgstr "извеждане на етикетите (може да Ñе комбинира Ñ â€ž--branches“ за клони)" -msgid "only show heads (can be combined with tags)" -msgstr "извеждане на върховете (може да Ñе комбинира Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚Ð¸Ñ‚Ðµ)" +msgid "only show branches (can be combined with tags)" +msgstr "извеждане на клоните (може да Ñе комбинира Ñ â€ž--tags“ за етикети)" msgid "check for reference existence without resolving" msgstr "проверка за ÑъщеÑтвуване на указател без проÑледÑването му" @@ -13183,14 +13312,14 @@ msgstr "" "друг подмодул" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "ÐеуÑпешно клониране на адреÑа „%s“ в Ð¿ÑŠÑ‚Ñ â€ž%s“ като подмодул" - -#, c-format msgid "directory not empty: '%s'" msgstr "директориÑта не е празна: „%s“" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "ÐеуÑпешно клониране на адреÑа „%s“ в Ð¿ÑŠÑ‚Ñ â€ž%s“ като подмодул" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "директориÑта на подмодула „%s“ не може да бъде получена" @@ -13555,9 +13684,11 @@ msgstr "причина за обновÑването" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a|-s|-u ИДЕÐТИФИКÐТОР_ÐÐ_КЛЮЧ] [-f] [-m СЪОБЩЕÐИЕ|-F ФÐЙЛ] [-e]\n" +" [(--trailer ЛЕКСЕМÐ[(=|:)СТОЙÐОСТ])…]\n" " ЕТИКЕТ [ПОДÐÐ’ÐÐЕ|ОБЕКТ]" msgid "git tag -d <tagname>..." @@ -14443,9 +14574,6 @@ msgstr "непозната заглавна чаÑÑ‚: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Ð’ хранилището липÑват Ñледните необходими подаваниÑ:" -msgid "need a repository to verify a bundle" -msgstr "за проверката на пратка е необходимо хранилище" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14856,6 +14984,9 @@ msgstr "Получаване на изтлаÑканото в хранилище msgid "Manage reflog information" msgstr "Управление на информациÑта в журнала на указателите" +msgid "Low-level access to refs" +msgstr "ДоÑтъп от ниÑко ниво до указателите" + msgid "Manage set of tracked repositories" msgstr "Управление на набор от Ñледени хранилища" @@ -15167,6 +15298,14 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" "откъÑÑŠÑ‚ за данните необходими на гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта липÑва или е повреден" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"изключване на филтрите на Блум за Ñлой „%s“ на гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта поради " +"неÑъвмеÑтими наÑтройки" + msgid "commit-graph has no base graphs chunk" msgstr "базовиÑÑ‚ Ð¾Ñ‚ÐºÑŠÑ Ð»Ð¸Ð¿Ñва в гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта" @@ -15298,6 +15437,14 @@ msgstr "" "опит за Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта, но наÑтройката „core.commitGraph“ е " "изключена" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"опит за Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° гра̀фа Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта, но наÑтройката „commitGraph." +"changedPathsVersion“ (%d) не Ñе поддържа" + msgid "too many commits to write graph" msgstr "прекалено много Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ Ð·Ð° запиÑване на гра̀фа" @@ -17213,16 +17360,21 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v|--version] [-h|--help] [-C ПЪТ] [-c ИМЕ=СТОЙÐОСТ]\n" " [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n" -" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" -" [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n" -" [--config-env=ИМЕ=ПРОМЕÐЛИВÐ_ÐÐ_СРЕДÐТÐ] КОМÐÐДР[ÐРГ…]" +" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--no-lazy-" +"fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=ПЪТ]\n" +" [--work-tree=ПЪТ] [--namespace=ИМЕ] [--config-" +"env=ИМЕ=ПРОМЕÐЛИВÐ_ÐÐ_СРЕДÐТÐ]\n" +" КОМÐÐДР[ÐРГ…]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -17576,13 +17728,13 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" +msgid "not a git repository" +msgstr "не е хранилище на Git" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "опциÑта „--packfile“ изиÑква валидна контролна Ñума (а не „%s“)" -msgid "not a git repository" -msgstr "не е хранилище на Git" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "" @@ -17594,6 +17746,9 @@ msgstr "Управлението на делегирането не Ñе подРmsgid "Public key pinning not supported with cURL < 7.39.0" msgstr "Задаването на поÑтоÑнен публичен ключ не Ñе поддържа от cURL < 7.39.0" +msgid "Unknown value for http.proactiveauth" +msgstr "Ðепозната ÑтойноÑÑ‚ за „http.proactiveauth“" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "„CURLSSLOPT_NO_REVOKE“ не Ñе поддържа от cURL < 7.44.0" @@ -17613,6 +17768,12 @@ msgstr "" "РеализациÑта на SSL не може да Ñе зададе да е „%s“, защото вече е зададена " "друга" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "отказ от прочитане на биÑквитките от „http.cookiefile“: „-“" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "преÑкачане на „http.savecookies“ за празен „http.cookiefile“" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -17776,6 +17937,10 @@ msgid "quoted CRLF detected" msgstr "цитирани знаци CRLF" #, c-format +msgid "unable to format message: %s" +msgstr "Ñъобщението не може да Ñе форматира: %s" + +#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "ÐеуÑпешно Ñливане на подмодула „%s“ (не е изтеглен)" @@ -17788,8 +17953,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "ÐеуÑпешно Ñливане на подмодула „%s“ (нÑма подаваниÑ)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "ÐеуÑпешно Ñливане на подмодула „%s“ (хранилището е Ñ Ð³Ñ€ÐµÑˆÐºÐ¸)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "ГРЕШКÐ: неуÑпешно Ñливане на подмодула „%s“ (хранилището е Ñ Ð³Ñ€ÐµÑˆÐºÐ¸)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17818,12 +17983,13 @@ msgstr "" "ÐеуÑпешно Ñливане на подмодула „%s“, но Ñа открити множеÑтво решениÑ:\n" "%s" -msgid "failed to execute internal merge" -msgstr "неуÑпешно вътрешно Ñливане" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "ГРЕШКÐ: неуÑпешно вътрешно Ñливане за „%s“" #, c-format -msgid "unable to add %s to database" -msgstr "„%s“ не може да Ñе добави в базата от данни" +msgid "error: unable to add %s to database" +msgstr "ГРЕШКÐ: „%s“ не може да Ñе добави в базата от данни" #, c-format msgid "Auto-merging %s" @@ -17919,12 +18085,12 @@ msgstr "" "е изтрит в „%s“." #, c-format -msgid "cannot read object %s" -msgstr "обектът „%s“ не може да Ñе прочете" +msgid "error: cannot read object %s" +msgstr "ГРЕШКÐ: обектът „%s“ не може да Ñе прочете" #, c-format -msgid "object %s is not a blob" -msgstr "обектът „%s“ не е BLOB" +msgid "error: object %s is not a blob" +msgstr "ГРЕШКÐ: обектът „%s“ не е BLOB" #, c-format msgid "" @@ -18067,6 +18233,10 @@ msgstr "" "не е ÑÑно какво да Ñе прави Ñ Ð¾Ð±ÐµÐºÑ‚Ð° „%2$s“ (%3$s) Ñ Ð¿Ñ€Ð°Ð²Ð°Ì€ за доÑтъп „%1$06o“" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "ÐеуÑпешно Ñливане на подмодула „%s“ (хранилището е Ñ Ð³Ñ€ÐµÑˆÐºÐ¸)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Превъртане на подмодула „%s“ до Ñледното подаване:" @@ -18108,6 +18278,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "ÐеуÑпешно Ñливане на подмодула „%s“ (открити Ñа множеÑтво ÑливаниÑ)" +msgid "failed to execute internal merge" +msgstr "неуÑпешно вътрешно Ñливане" + +#, c-format +msgid "unable to add %s to database" +msgstr "„%s“ не може да Ñе добави в базата от данни" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Грешка: за да не Ñе изтрие неÑледениÑÑ‚ файл „%s“, Ñе запиÑва в „%s“." @@ -18210,6 +18387,14 @@ msgstr "" "КОÐФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" +#, c-format +msgid "cannot read object %s" +msgstr "обектът „%s“ не може да Ñе прочете" + +#, c-format +msgid "object %s is not a blob" +msgstr "обектът „%s“ не е BLOB" + msgid "modify" msgstr "промÑна" @@ -18294,11 +18479,6 @@ msgstr "редът не може да Ñе анализира: „%s“" msgid "malformed line: %s" msgstr "неправилен ред: „%s“." -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "" -"индекÑÑŠÑ‚ за множеÑтво пакети Ñе преÑкача, защото Ñумата за проверка не " -"Ñъвпада" - msgid "could not load pack" msgstr "пакетът не може да Ñе зареди" @@ -18306,6 +18486,11 @@ msgstr "пакетът не може да Ñе зареди" msgid "could not open index for %s" msgstr "индекÑÑŠÑ‚ за „%s“ не може да Ñе отвори" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" +"индекÑÑŠÑ‚ за множеÑтво пакети Ñе преÑкача, защото Ñумата за проверка не " +"Ñъвпада" + msgid "Adding packfiles to multi-pack-index" msgstr "ДобавÑне на пакетни файлове към Ð¸Ð½Ð´ÐµÐºÑ Ð·Ð° множеÑтво пакети" @@ -18946,6 +19131,17 @@ msgstr "обектът „%s“ не може да бъде анализиран msgid "hash mismatch %s" msgstr "разлика в контролната Ñума: „%s“" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "повтарÑщ Ñе Ð·Ð°Ð¿Ð¸Ñ Ð¿Ñ€Ð¸ запазване на Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки: „%s“" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "опит за ÑъхранÑване на подаване, което не е избрано: „%s“" + +msgid "too many pseudo-merges" +msgstr "прекалено много пÑевдо ÑливаниÑ" + msgid "trying to write commit not in index" msgstr "опит за запиÑване на обект за подаване извън индекÑа" @@ -18973,6 +19169,22 @@ msgstr "" "повреден файл за Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки (прекалено е малък дори и за " "таблицата ÑÑŠÑ ÑъответÑтвиÑ)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"повреден файл за Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки (прекалено е малък дори и за " +"заглавната чаÑÑ‚ на таблицата за пÑевдо ÑливаниÑта)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" +"повреден файл за Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки (прекалено е малък дори и за " +"таблицата Ñ Ð¿Ñевдо ÑливаниÑ)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "" +"повреден Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки, таблицата Ñ Ð¿Ñевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ðµ " +"прекалено малка" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "повтарÑщ Ñе Ð·Ð°Ð¿Ð¸Ñ Ð² Ð¸Ð½Ð´ÐµÐºÑ Ð½Ð° база битови маÑки: „%s“" @@ -19045,6 +19257,11 @@ msgid "unable to load pack: '%s', disabling pack-reuse" msgstr "" "пакетът не може да Ñе зареди: „%s“, преизползването на пакети Ñе изключва" +msgid "unable to compute preferred pack, disabling pack-reuse" +msgstr "" +"предпочитаниÑÑ‚ пакет не може да Ñе определи, преизползването на пакети Ñе " +"изключва" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "обектът „%s“ липÑва в битовата маÑка на видовете" @@ -19075,6 +19292,10 @@ msgid "mismatch in bitmap results" msgstr "различие в резултатите от битовите маÑки" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "индекÑÑŠÑ‚ за пÑевдо Ñливане е извън диапазона (%<PRIu32> ≥ %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "„%s“ липÑва в пакет „%s“ при отмеÑтване %<PRIuMAX>" @@ -19244,18 +19465,6 @@ msgstr "непознат флаг „%c“" msgid "unknown non-ascii option in string: `%s'" msgstr "непозната ÑтойноÑÑ‚ извън „ascii“ в низа: „%s“" -#, c-format -msgid "[=<%s>]" -msgstr "[=%s]" - -#, c-format -msgid "[<%s>]" -msgstr "[%s]" - -#, c-format -msgid " <%s>" -msgstr " %s" - msgid "..." msgstr "…" @@ -19468,6 +19677,9 @@ msgstr "не може да Ñе Ñъздаде нишка за изпълненРmsgid "unable to parse --pretty format" msgstr "аргументът към опциÑта „--pretty“ не може да Ñе анализира" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "отложеното доÑтавÑне е изключено, нÑкои обекти може и да липÑват" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "хранилище-гарант: неуÑпешно Ñъздаване на Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð° доÑтавÑне" @@ -19494,6 +19706,66 @@ msgstr "object-info: Ñлед аргументите Ñе очаква Ð¸Ð·Ñ‡Ð¸Ñ msgid "Removing duplicate objects" msgstr "Изтриване на повтарÑщите Ñе обекти" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "" +"регулÑрниÑÑ‚ израз за пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð° „%s“, не може да бъде зареден: „%s“" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s Ñ‚Ñ€Ñбва да е неотрицателно, ще Ñе ползва Ñтандартната ÑтойноÑÑ‚" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s Ñ‚Ñ€Ñбва да е между 0 и 1, ще Ñе ползва Ñтандартната ÑтойноÑÑ‚" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s Ñ‚Ñ€Ñбва да е положително, ще Ñе ползва Ñтандартната ÑтойноÑÑ‚" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "в групата за пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ â€ž%s“ липÑва задължителен шаблон" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "в групата за пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ â€ž%s“ има неÑтабилен праг пред ÑтабилниÑ" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"регулÑрниÑÑ‚ израз за пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð² ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» Ñъдържа повече " +"от макÑимално поддържаните прихващащи групи (max=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"опит за четене на разширено пÑевдо Ñливане извън диапазона (%<PRIuMAX> ≥ " +"%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"прекалено кратък Ð·Ð°Ð¿Ð¸Ñ Ð·Ð° разширено пÑевдо Ñливане (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "липÑва пÑевдо Ñливане за подаване „%s“ при отмеÑтване %<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "" +"четене за група за пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð´ границите (%<PRIu32> ≥ %<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "четене зад границите (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "таблицата Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ‚Ðµ пÑевдо ÑÐ»Ð¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð° „%s“ не може да Ñе прочете" + msgid "could not start `log`" msgstr "командата за журнала Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ â€žlog“ не може да Ñе Ñтартира" @@ -20077,14 +20349,13 @@ msgid "" "\n" "\tgit branch -m <name>\n" msgstr "" -"ПървоначалниÑÑ‚ клон ще Ñе казва „%s“. Това може да Ñе променÑ. Може да " -"зададете\n" +"ПървоначалниÑÑ‚ клон ще Ñе казва „%s“. Това може да Ñе променÑ. Може да зададете\n" "наÑтройката и да Ñпрете това Ñъобщение. За това изпълнете:\n" "\n" " git config --global init.defaultBranch ИМЕ\n" "\n" "ЧеÑто ползвани варианти вмеÑто „master“ Ñа „main“, „trunk“ и „development“.\n" -"За да преименувата току що Ñъздаден клон, изпълнете:\n" +"За да преименувате току що Ñъздаден клон, изпълнете:\n" "\n" " git branch -m ИМЕ\n" @@ -20112,11 +20383,20 @@ msgstr "журналът Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s msgid "log for %s is empty" msgstr "журналът Ñ Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñта за ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ â€ž%s“ е празен" +msgid "refusing to force and skip creation of reflog" +msgstr "" +"принудителна Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð±ÐµÐ· Ñъздаване на журнал на указателите нÑма да Ñе " +"приеме" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "указател не може да Ñе обнови Ñ Ð³Ñ€ÐµÑˆÐ½Ð¾ име „%s“" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "пÑевдо указателÑÑ‚ „%s“ нÑма да Ñе обнови" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "неуÑпешно обновÑване на ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ (update_ref) „%s“: %s" @@ -20147,6 +20427,25 @@ msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "Пробната Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° указатели завърши, резултатите Ñа в „%s“\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "временната Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ â€ž%s“ не може да Ñе изтрие" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "мигрираните указатели Ñа в „%s“" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"указателÑÑ‚ „%s“ не може да Ñе заключи: очакваше Ñе файл Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ» Ñ Ñ†ÐµÐ» " +"„%s“, но вмеÑто това е обикновен указател" + +#, c-format msgid "refname is dangerous: %s" msgstr "опаÑно име на указател: %s" @@ -20694,9 +20993,7 @@ msgstr "„%s“ ÑъщеÑтвува и не е Ñимволна връзка" msgid "" "--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, " "REVERT_HEAD or REBASE_HEAD" -msgstr "" -"„--merge“ изиÑква нÑкой от пÑевдоуказателите „MERGE_HEAD“, " -"„CHERRY_PICK_HEAD“, „REVERT_HEAD“ или „REBASE_HEAD“" +msgstr "„--merge“ изиÑква нÑкой от пÑевдо указателите „MERGE_HEAD“, „CHERRY_PICK_HEAD“, „REVERT_HEAD“ или „REBASE_HEAD“" #, c-format msgid "could not get commit for --ancestry-path argument %s" @@ -21357,6 +21654,56 @@ msgstr "" "командата „update-ref“ изиÑква пълно име на указател, напр. „refs/heads/%s“" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "„%s“ не приема Ð¿Ð¾Ð´Ð°Ð²Ð°Ð½Ð¸Ñ ÑÑŠÑ Ñливане" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"„pick“ не приема подаване ÑÑŠÑ Ñливане. Ðко иÑкате да приложите\n" +"Ñливането наново изпълнате:\n" +"\n" +" git merge -C ПОДÐÐ’ÐÐЕ" + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"„reword“ не приема подаване ÑÑŠÑ Ñливане. Ðко иÑкате да приложите\n" +"Ñливането наново и да промените Ñъобщението при подаване, изпълнете\n" +"\n" +" git merge -C ПОДÐÐ’ÐÐЕ" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"„edit“ не приема подаване ÑÑŠÑ Ñливане. Ðко иÑкате да приложите\n" +"Ñливането наново, изпълнете\n" +"\n" +" git merge -C ПОДÐÐ’ÐÐЕ\n" +"\n" +"а Ñлед него задайте „break“, за да получите контрол и да изпълнете:\n" +"\n" +" git commit --amend && git rebase --continue" + +msgid "cannot squash merge commit into another commit" +msgstr "подаване ÑÑŠÑ Ñливане не може да Ñе вкара в друго" + +#, c-format msgid "invalid command '%.*s'" msgstr "неправилна команда „%.*s“" @@ -21483,9 +21830,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "указателÑÑ‚ „HEAD“ не може да бъде прочетен" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "„%s“ не може да Ñе копира като „%s“" +msgid "could not write commit message file" +msgstr "файлът ÑÑŠÑ Ñъобщението за подаване не може да бъде запиÑан" #, c-format msgid "" @@ -21894,6 +22240,18 @@ msgstr "процеÑÑŠÑ‚ не може да Ñе върне към предишРmsgid "failed to stat '%*s%s%s'" msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „stat“ за „%*s%s%s“" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"заÑечено е проблемно притежание на хранилището „%s“\n" +"%sЗа да зададете изключение за тази директориÑ, изпълнете:\n" +"\n" +" git config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Текущата работна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ðµ може да бъде прочетена" @@ -21918,18 +22276,6 @@ msgstr "" "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"заÑечено е проблемно притежание на хранилището „%s“\n" -"%sЗа да зададете изключение за тази директориÑ, изпълнете:\n" -"\n" -" git config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "" "голото хранилище „%s“ не може да Ñе ползва („safe.bareRepository“ е „%s“)" @@ -22241,6 +22587,14 @@ msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "„%s“ (Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° подмодул) е в директориÑта на git: „%.*s“" #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "„%.*s“ в Ð¿ÑŠÑ‚Ñ Ð·Ð° подмодул „%s“ не Ñ‚Ñ€Ñбва да е Ñимволна връзка" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "пътÑÑ‚ за подмодул „%s“ не Ñ‚Ñ€Ñбва да е Ñимволна връзка" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -22279,10 +22633,6 @@ msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€Ðµ msgid "no remote configured to get bundle URIs from" msgstr "не е наÑтроено отдалечено хранилище за ÑпиÑъците Ñ Ð°Ð´Ñ€ÐµÑи на пратки" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "не е зададен никакъв Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище„%s“" - msgid "could not get the bundle-uri list" msgstr "ÑпиÑъкът Ñ Ð°Ð´Ñ€ÐµÑи на пратки не може да Ñе получи" @@ -22613,9 +22963,7 @@ msgid "bundle-uri operation not supported by protocol" msgstr "операциÑта „bundle-uri“ (адреÑи на пратки) не Ñе поддържа от протокола" msgid "could not retrieve server-advertised bundle-uri list" -msgstr "" -"ÑпъÑъкът Ñ Ð°Ð´Ñ€ÐµÑи на пратки обÑвени за налични от Ñървъра не може да Ñе " -"получи " +msgstr "ÑпиÑъкът Ñ Ð°Ð´Ñ€ÐµÑи на пратки обÑвени за налични от Ñървъра не може да Ñе получи " msgid "operation not supported by protocol" msgstr "опциÑта не Ñе поддържа от протокола" @@ -23379,7 +23727,7 @@ msgid "" "but the results were cached, and subsequent runs may be faster." msgstr "" "ИзброÑването на неÑледените файлове отне %.2f Ñекунди, но\n" -"резултатите Ñа запомнени и може да забързат поÑледващиге изброÑваниÑ." +"резултатите Ñа запомнени и може да забързат поÑледващите изброÑваниÑ." #, c-format msgid "It took %.2f seconds to enumerate untracked files." @@ -23785,24 +24133,24 @@ msgid "Failed to send %s\n" msgstr "„%s“ не може да бъде изпратен\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Проба за изпращане на „%s“\n" +msgid "Dry-Sent %s" +msgstr "Проба за изпращане на „%s“" #, perl-format -msgid "Sent %s\n" -msgstr "Изпращане на „%s“\n" +msgid "Sent %s" +msgstr "Изпращане на „%s“" -msgid "Dry-OK. Log says:\n" -msgstr "УÑпех при пробата. От журнала:\n" +msgid "Dry-OK. Log says:" +msgstr "УÑпех при пробата. От журнала:" -msgid "OK. Log says:\n" -msgstr "УÑпех. От журнала:\n" +msgid "OK. Log says:" +msgstr "УÑпех. От журнала:" msgid "Result: " msgstr "Резултат: " -msgid "Result: OK\n" -msgstr "Резултат: уÑпех\n" +msgid "Result: OK" +msgstr "Резултат: уÑпех" #, perl-format msgid "can't open file %s" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-26 16:16+0200\n" -"PO-Revision-Date: 2024-04-26 16:22+0200\n" +"POT-Creation-Date: 2024-07-19 19:21+0200\n" +"PO-Revision-Date: 2024-07-19 19:25+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German\n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.4.1\n" +"X-Generator: Poedit 3.4.4\n" #, c-format msgid "Huh (%s)?" @@ -582,6 +582,10 @@ msgstr "" "p - aktuellen Patch-Block anzeigen\n" "? - Hilfe anzeigen\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Es wird nur ein Buchstabe erwartet, '%s' erhalten" + msgid "No previous hunk" msgstr "Kein vorheriger Patch-Block" @@ -630,9 +634,19 @@ msgstr "In %d Patch-Block aufgeteilt." msgid "Sorry, cannot edit this hunk" msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Unbekannter Befehl '%s' (für Hilfe '?' verwenden)" + msgid "'git apply' failed" msgstr "'git apply' schlug fehl" +msgid "No changes." +msgstr "Keine Änderungen." + +msgid "Only binary files changed." +msgstr "Nur Binärdateien geändert." + #, c-format msgid "" "\n" @@ -1517,6 +1531,10 @@ msgstr "ignoriere übermäßig große gitattributes-Datei '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "ignoriere übermäßig großen gitattribute-Blob '%s'" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "" +"kann nicht --attr-source oder GIT_ATTR_SOURCE ohne Repository verwenden" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "ungültiges --attr-source oder GIT_ATTR_SOURCE" @@ -1838,13 +1856,6 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"Die Einstellung add.interactive.useBuiltin wurde entfernt!\n" -"Siehe den Eintrag in 'git help config' für Details." - msgid "could not read the index" msgstr "konnte den Index nicht lesen" @@ -2302,6 +2313,9 @@ msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen" msgid "show the patch being applied" msgstr "den Patch, der gerade angewendet wird, anzeigen" +msgid "try to apply current patch again" +msgstr "den aktuellen Patch erneut versuchen anzuwenden" + msgid "record the empty patch as an empty commit" msgstr "leerer Patch als leeren Commit gespeichert" @@ -2357,9 +2371,6 @@ msgstr "git apply [<Optionen>] [<Patch>...]" msgid "could not redirect output" msgstr "konnte Ausgabe nicht umleiten" -msgid "git archive: Remote with no URL" -msgstr "git archive: Externes Archiv ohne URL" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen" @@ -3282,6 +3293,9 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "do not show bundle details" msgstr "Keine Bundle-Details anzeigen" +msgid "need a repository to verify a bundle" +msgstr "um ein Paket zu überprüfen wird ein Repository benötigt" + #, c-format msgid "%s is okay\n" msgstr "%s ist in Ordnung\n" @@ -4324,6 +4338,14 @@ msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "Hardlink bei '%s' kann nicht geprüft werden" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "Hardlink unterscheidet sich von der Quelle bei '%s'" + +#, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" @@ -5180,15 +5202,52 @@ msgstr "" "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git restore --staged :/\" zur Wiederherstellung aus." -msgid "git config [<options>]" -msgstr "git config [<Optionen>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<Datei-Option>] [<Anzeige-Option>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "nicht erkanntes --type Argument, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<Datei-Option>] [<Anzeige-Option>] [--includes] [--all] [--" +"regexp=<Regex>] [--value=<Wert>] [--fixed-value] [--default=<Standardwert>] " +"<Name>" -msgid "only one type at a time" -msgstr "nur ein Typ erlaubt" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<Datei-Option>] [--type=<Typ>] [--all] [--value=<Wert>] [--" +"fixed-value] <Name> <Wert>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<Datei-Option>] [--all] [--value=<Wert>] [--fixed-value] " +"<Name> <Wert>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<Datei-Option>] <alter-Name> <neuer-Name>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<Datei-Option>] <Name>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<Datei-Option>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "" +"git config [<Datei-Option>] --get-colorbool <Name> [<Standard-Ausgabe-ist-" +"Terminal>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<Datei-Option>] [--type=<Typ>] [--comment=<Nachricht>] [--" +"all] [--value=<Wert>] [--fixed-value] <Name> <Wert>" msgid "Config file location" msgstr "Ort der Konfigurationsdatei" @@ -5214,55 +5273,6 @@ msgstr "Blob-Id" msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -msgid "Action" -msgstr "Aktion" - -msgid "get value: name [value-pattern]" -msgstr "Wert zurückgeben: Name [Wert-Muster]" - -msgid "get all values: key [value-pattern]" -msgstr "alle Werte zurückgeben: Schlüssel [Wert-Muster]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "Werte für den regulären Ausdruck zurückgeben: Name-Regex [Wert-Muster]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-Muster] " - -msgid "add a new variable: name value" -msgstr "neue Variable hinzufügen: Name Wert" - -msgid "remove a variable: name [value-pattern]" -msgstr "eine Variable entfernen: Name [Wert-Muster]" - -msgid "remove all matches: name [value-pattern]" -msgstr "alle Ãœbereinstimmungen entfernen: Name [Wert-Muster]" - -msgid "rename section: old-name new-name" -msgstr "eine Sektion umbenennen: alter-Name neuer-Name" - -msgid "remove a section: name" -msgstr "eine Sektion entfernen: Name" - -msgid "list all" -msgstr "alles auflisten" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "" -"nutze String-Gleichheit beim Vergleich von Werten mit dem 'Wert-Muster'" - -msgid "open an editor" -msgstr "einen Editor öffnen" - -msgid "find the color configured: slot [default]" -msgstr "die konfigurierte Farbe finden: Slot [Standard]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" - msgid "Type" msgstr "Typ" @@ -5290,8 +5300,8 @@ msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" msgid "value is an expiry date" msgstr "Wert ist ein Verfallsdatum" -msgid "Other" -msgstr "Sonstiges" +msgid "Display options" +msgstr "Anzeigeoptionen" msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" @@ -5299,9 +5309,6 @@ msgstr "schließt Werte mit NUL-Byte ab" msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -msgid "respect include directives on lookup" -msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " @@ -5312,15 +5319,15 @@ msgstr "" "Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, " "systemweit, Befehl)" -msgid "value" -msgstr "Wert" +msgid "show config keys in addition to their values" +msgstr "Konfigurationsschlüssel zusätzlich zu dessen Werten anzeigen" -msgid "with --get, use default value when missing entry" -msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "nicht erkanntes --type Argument, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "" -"menschenlesbare Kommentarzeichenfolge (# wird bei Bedarf vorangestellt)" +msgid "only one type at a time" +msgstr "nur ein Typ erlaubt" #, c-format msgid "wrong number of arguments, should be %d" @@ -5398,47 +5405,73 @@ msgstr "" "lesen Sie die Sektion \"CONFIGURATION FILE\" in \"git help worktree\" für " "Details" -msgid "--get-color and variable type are incoherent" -msgstr "Angabe von --get-color und Variablentyp sind ungültig." +msgid "Other" +msgstr "Sonstiges" -msgid "only one action at a time" -msgstr "Nur eine Aktion erlaubt." +msgid "respect include directives on lookup" +msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "Konnte Konfigurationsdatei '%s' nicht lesen." -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list" +msgid "error processing config file(s)" +msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)." -msgid "--default is only applicable to --get" -msgstr "--default ist nur anwendbar auf --get" +msgid "Filter options" +msgstr "Filter-Optionen" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "" -"--comment darf nur für die Operationen add/set/replace verwendet werden" +msgid "return all values for multi-valued config options" +msgstr "alle Werte für mehrwertige Konfigurationsoptionen zurückgeben" + +msgid "interpret the name as a regular expression" +msgstr "den Namen als regulären Ausdruck interpretieren" + +msgid "show config with values matching the pattern" +msgstr "Anzeige von Konfiguration mit Werten, die dem Muster entsprechen" + +msgid "use string equality when comparing values to value pattern" +msgstr "String-Gleichheit beim Vergleich von Werten mit Wertmustern verwenden" + +msgid "URL" +msgstr "URL" + +msgid "show config matching the given URL" +msgstr "Konfiguration für die angegebene URL anzeigen" + +msgid "value" +msgstr "Wert" + +msgid "use default value when missing entry" +msgstr "Standardwert verwenden, wenn Eintrag fehlt" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value wird nur zusammen mit 'Wert-Muster' angewendet" -#, c-format -msgid "unable to read config file '%s'" -msgstr "Konnte Konfigurationsdatei '%s' nicht lesen." +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= kann nicht mit --all oder --url= verwendet werden" -msgid "error processing config file(s)" -msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)." +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= kann nicht mit --all, --regexp oder --value verwendet werden" -msgid "editing stdin is not supported" -msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt." +msgid "Filter" +msgstr "Filter" -msgid "editing blobs is not supported" -msgstr "Das Bearbeiten von Blobs wird nicht unterstützt." +msgid "replace multi-valued config option with new value" +msgstr "mehrwertige Konfigurationsoption durch einen neuen Wert ersetzen" -#, c-format -msgid "cannot create configuration file %s" -msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "" +"menschenlesbare Kommentarzeichenfolge (# wird bei Bedarf vorangestellt)" + +msgid "add a new line without altering any existing values" +msgstr "eine neue Zeile hinzufügen, ohne bestehende Werte zu ändern" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value gilt nur mit --value=<pattern>" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append kann nicht mit --value=<pattern> verwendet werden" #, c-format msgid "" @@ -5453,6 +5486,86 @@ msgstr "" msgid "no such section: %s" msgstr "Sektion nicht gefunden: %s" +msgid "editing stdin is not supported" +msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt." + +msgid "editing blobs is not supported" +msgstr "Das Bearbeiten von Blobs wird nicht unterstützt." + +#, c-format +msgid "cannot create configuration file %s" +msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." + +msgid "Action" +msgstr "Aktion" + +msgid "get value: name [<value-pattern>]" +msgstr "Wert zurückgeben: Name [<Wert-Muster>]" + +msgid "get all values: key [<value-pattern>]" +msgstr "alle Werte zurückgeben: Schlüssel [<Wert-Muster>]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "Werte für den regulären Ausdruck zurückgeben: Name-Regex <Wert-Muster>" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "alle passenden Variablen ersetzen: Name Wert [<Wert-Muster>]" + +msgid "add a new variable: name value" +msgstr "neue Variable hinzufügen: Name Wert" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "eine Variable entfernen: Name [<Wert-Muster>]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "alle Treffer entfernen: Name [<Wert-Muster>]" + +msgid "rename section: old-name new-name" +msgstr "eine Sektion umbenennen: alter-Name neuer-Name" + +msgid "remove a section: name" +msgstr "eine Sektion entfernen: Name" + +msgid "list all" +msgstr "alles auflisten" + +msgid "open an editor" +msgstr "einen Editor öffnen" + +msgid "find the color configured: slot [<default>]" +msgstr "die konfigurierte Farbe finden: Slot [<Standard>]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" + +msgid "with --get, use default value when missing entry" +msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" + +msgid "--get-color and variable type are incoherent" +msgstr "Angabe von --get-color und Variablentyp sind ungültig." + +msgid "no action specified" +msgstr "keine Aktion angegeben" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list" + +msgid "--default is only applicable to --get" +msgstr "--default ist nur anwendbar auf --get" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "" +"--comment darf nur für die Operationen add/set/replace verwendet werden" + msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" @@ -6306,6 +6419,9 @@ msgstr "Konfiguration" msgid "config key storing a list of repository paths" msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden" +msgid "keep going even if command fails in a repository" +msgstr "weiterarbeiten, auch wenn der Befehl in einem Repository fehlschlägt" + msgid "missing --config=<config>" msgstr "Option --config=<Konfiguration> fehlt" @@ -7781,8 +7897,11 @@ msgstr "die Serie als n-te Fassung kennzeichnen" msgid "max length of output filename" msgstr "maximale Länge des Dateinamens für die Ausgabe" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "[RFC PATCH] statt [PATCH] verwenden" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "<rfc> (standardmäßig 'RFC') vor 'PATCH' hinzufügen" msgid "cover-from-description-mode" msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung" @@ -8058,11 +8177,11 @@ msgstr "" "verwendet werden" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<Programm>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<Schlüssel>]\n" " [--symref] [<Repository> [<Muster>...]]" @@ -8078,8 +8197,11 @@ msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" msgid "limit to tags" msgstr "auf Tags einschränken" -msgid "limit to heads" -msgstr "auf Branches einschränken" +msgid "limit to branches" +msgstr "Beschränkung auf Branches" + +msgid "deprecated synonym for --branches" +msgstr "veraltetes Synonym für --branches" msgid "do not show peeled tags" msgstr "keine Tags anzeigen, die andere Tags enthalten" @@ -10805,6 +10927,22 @@ msgstr "Kein Reflog zum Löschen angegeben." msgid "invalid ref format: %s" msgstr "Ungültiges Format für Referenzen: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<Format> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "das Referenzformat angeben, in das konvertiert werden soll" + +msgid "perform a non-destructive dry-run" +msgstr "einen zerstörungsfreien Trockenlauf durchführen" + +msgid "missing --ref-format=<format>" +msgstr "fehlendes --ref-format=<Format>" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "das Repository verwendet bereits das Format '%s'" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11092,9 +11230,6 @@ msgstr "* Remote-Repository %s" msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -msgid "(no URL)" -msgstr "(keine URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -11103,6 +11238,9 @@ msgstr "(keine URL)" msgid " Push URL: %s" msgstr " URL zum Versenden: %s" +msgid "(no URL)" +msgstr "(keine URL)" + #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" @@ -11212,10 +11350,6 @@ msgstr "nur URLs für Push ausgeben" msgid "return all URLs" msgstr "alle URLs ausgeben" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." - msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" @@ -12235,12 +12369,12 @@ msgstr "Unbekannter Hash-Algorithmus" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<Muster>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<Muster>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -12263,11 +12397,11 @@ msgstr "Referenz nicht vorhanden" msgid "failed to look up reference" msgstr "Fehler beim Nachschlagen der Referenz" -msgid "only show tags (can be combined with heads)" -msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)" +msgid "only show tags (can be combined with branches)" +msgstr "nur Tags anzeigen (kann mit Branches kombiniert werden)" -msgid "only show heads (can be combined with tags)" -msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)" +msgid "only show branches (can be combined with tags)" +msgstr "nur Branches anzeigen (kann mit Tags kombiniert werden)" msgid "check for reference existence without resolving" msgstr "Prüfung auf Vorhandensein einer Referenz, ohne diese aufzulösen" @@ -12919,14 +13053,14 @@ msgstr "" "verweigert." #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." - -#, c-format msgid "directory not empty: '%s'" msgstr "Verzeichnis ist nicht leer: '%s'" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." @@ -13297,9 +13431,11 @@ msgstr "Grund für die Aktualisierung" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <Key-ID>] [-f] [-m <Beschreibung> | -F <Datei>] [-e]\n" +" [(--trailer <Token>[(=|:)<Wert>])...]\n" " <Tagname> [<Commit> | <Objekt>]" msgid "git tag -d <tagname>..." @@ -14189,9 +14325,6 @@ msgstr "nicht erkannter Kopfbereich: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -msgid "need a repository to verify a bundle" -msgstr "um ein Paket zu überprüfen wird ein Repository benötigt" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14615,6 +14748,9 @@ msgstr "Empfangen was in das Repository übertragen wurde" msgid "Manage reflog information" msgstr "Reflog Informationen verwalten" +msgid "Low-level access to refs" +msgstr "Low-Level Zugang zu Referenzen" + msgid "Manage set of tracked repositories" msgstr "Menge von hinterlegten Repositories verwalten" @@ -14925,6 +15061,14 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" "Commit-Graph erforderlicher Commit-Daten Chunk fehlt oder ist beschädigt" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"deaktiviere Bloom-Filter für die Commit-Graph-Ebene '%s' aufgrund " +"inkompatibler Einstellungen" + msgid "commit-graph has no base graphs chunk" msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" @@ -15052,6 +15196,14 @@ msgstr "" "versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist " "deaktiviert" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"versuche, einen Commit-Graphen zu schreiben, aber 'commitGraph." +"changedPathsVersion' (%d) wird nicht unterstützt" + msgid "too many commits to write graph" msgstr "zu viele Commits zum Schreiben des Graphen" @@ -16941,17 +17093,21 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <Pfad>] [-c <Name>=<Wert>]\n" " [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" -" [--config-env=<Name>=<Umgebungsvariable>] <Befehl> [<Argumente>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<Pfad>]\n" +" [--work-tree=<Pfad>] [--namespace=<Name>] [--config-" +"env=<Name>=<Umgebungsvariable>]\n" +" <Befehl> [<Argumente>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -17293,13 +17449,13 @@ msgstr "" "Sie können diese Warnung mit `git config advice.ignoredHook false` " "deaktivieren." +msgid "not a git repository" +msgstr "kein Git-Repository" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)" -msgid "not a git repository" -msgstr "kein Git-Repository" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "negativer Wert für http.postBuffer; benutze Standardwert %d" @@ -17312,6 +17468,9 @@ msgstr "" "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht " "unterstützt" +msgid "Unknown value for http.proactiveauth" +msgstr "Unbekannter Wert für http.proactiveauth" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt." @@ -17328,6 +17487,12 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "Lesen von Cookies von http.cookiefile '-' verweigert" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "http.savecookies wird bei leerem http.cookiefile ignoriert" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -17505,9 +17670,10 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" +msgid "error: failed to merge submodule %s (repository corrupt)" msgstr "" -"Submodul %s konnte nicht zusammengeführt werden (Repository beschädigt)" +"Fehler: Submodul %s konnte nicht zusammengeführt werden (Repository " +"beschädigt)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17537,12 +17703,13 @@ msgstr "" "sind vorhanden:\n" "%s" -msgid "failed to execute internal merge" -msgstr "Fehler bei Ausführung des internen Merges" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "Fehler: Der interne Merge für %s konnte nicht ausgeführt werden" #, c-format -msgid "unable to add %s to database" -msgstr "konnte %s nicht zur Datenbank hinzufügen" +msgid "error: unable to add %s to database" +msgstr "Fehler: kann %s nicht zur Datenbank hinzufügen" #, c-format msgid "Auto-merging %s" @@ -17640,12 +17807,12 @@ msgstr "" "KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht." #, c-format -msgid "cannot read object %s" -msgstr "kann Objekt %s nicht lesen" +msgid "error: cannot read object %s" +msgstr "Fehler: kann Objekt %s nicht lesen" #, c-format -msgid "object %s is not a blob" -msgstr "Objekt %s ist kein Blob" +msgid "error: object %s is not a blob" +msgstr "Fehler: Objekt %s ist kein Blob" #, c-format msgid "" @@ -17698,7 +17865,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: -#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #, c-format msgid "" @@ -17788,6 +17955,11 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "" +"Submodul %s konnte nicht zusammengeführt werden (Repository beschädigt)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" @@ -17828,6 +18000,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" +msgid "failed to execute internal merge" +msgstr "Fehler bei Ausführung des internen Merges" + +#, c-format +msgid "unable to add %s to database" +msgstr "konnte %s nicht zur Datenbank hinzufügen" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -17935,6 +18114,14 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" +#, c-format +msgid "cannot read object %s" +msgstr "kann Objekt %s nicht lesen" + +#, c-format +msgid "object %s is not a blob" +msgstr "Objekt %s ist kein Blob" + msgid "modify" msgstr "ändern" @@ -18019,10 +18206,6 @@ msgstr "Zeile konnte nicht geparst werden: %s" msgid "malformed line: %s" msgstr "fehlerhafte Zeile: %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "" -"ignoriere existierenden Multi-Pack-Index; Prüfsumme stimmt nicht überein" - msgid "could not load pack" msgstr "Paket konnte nicht geladen werden" @@ -18030,6 +18213,10 @@ msgstr "Paket konnte nicht geladen werden" msgid "could not open index for %s" msgstr "konnte Index für %s nicht öffnen" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" +"ignoriere existierenden Multi-Pack-Index; Prüfsumme stimmt nicht überein" + msgid "Adding packfiles to multi-pack-index" msgstr "Packdateien zum Multi-Pack-Index hinzufügen" @@ -18489,7 +18676,7 @@ msgstr "%s [ungültiges Objekt]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #, c-format msgid "%s commit %s - %s" @@ -18498,7 +18685,7 @@ msgstr "%s Commit %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -18514,7 +18701,7 @@ msgstr "%s Tag %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #, c-format msgid "%s [bad tag, could not parse it]" @@ -18655,6 +18842,17 @@ msgstr "Konnte Objekt '%s' nicht parsen." msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s überein." +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "doppelter Eintrag beim Schreiben des Bitmap-Index: %s" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "versuchte, nicht gewählten Commit '%s' zu speichern" + +msgid "too many pseudo-merges" +msgstr "zu viele Pseudo-Merges" + msgid "trying to write commit not in index" msgstr "Versuch, einen Commit zu schreiben, der nicht im Index steht" @@ -18679,6 +18877,17 @@ msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "" "beschädigte Bitmap-Indexdatei (zu kurz, um in die Lookup-Tabelle zu passen)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"beschädigte Bitmap-Indexdatei (zu kurz für den Pseudo-Merge-Tabellenkopf)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "beschädigte Bitmap-Indexdatei (zu kurz für die Pseudo-Merge-Tabelle)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "beschädigte Bitmap-Indexdatei, Pseudo-Merge-Tabelle zu kurz" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "duplizierter Eintrag im Bitmap-Index: '%s'" @@ -18776,6 +18985,10 @@ msgid "mismatch in bitmap results" msgstr "Unstimmigkeiten bei Bitmap-Ergebnissen" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "Pseudo-Merge-Index außerhalb des Bereichs (%<PRIu32> >= %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "konnte '%s' in Paket '%s' bei Offset %<PRIuMAX> nicht finden" @@ -19145,6 +19358,10 @@ msgstr "Kann Thread für lstat nicht erzeugen: %s" msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." +msgid "lazy fetching disabled; some objects may not be available" +msgstr "" +"lazy fetching deaktiviert; einige Objekte sind möglicherweise nicht verfügbar" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten" @@ -19170,6 +19387,67 @@ msgstr "object-info: erwartete Flush nach Argumenten" msgid "Removing duplicate objects" msgstr "Lösche doppelte Objekte" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "Pseudo-Merge-Regex konnte nicht geladen werden für %s: '%s'" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s muss nicht-negativ sein, Standardwert wird verwendet" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s muss zwischen 0 und 1 liegen, Standardwert wird verwendet" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s muss positiv sein, verwende Standardwert" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "Pseudo-Merge-Gruppe '%s' fehlt erforderliches Muster" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "" +"Pseudo-Merge-Gruppe '%s' hat einen instabilen vor einem stabilen " +"Schwellenwert" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"Pseudo-Merge-Regex aus der Konfiguration hat zu viele Capture-Gruppen " +"(maximum=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"erweiterter Pseudo-Merge liest außerhalb des Bereichs (%<PRIuMAX> >= " +"%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"erweiterter Pseudo-Merge-Eintrag ist zu kurz (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "konnte keinen Pseudo-Merge für Commit %s bei Offset %<PRIuMAX> finden" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "" +"erweiterte Pseudo-Merge-Suche außerhalb des Bereichs (%<PRIu32> >= %<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "Lesen außerhalb des zulässigen Bereichs: (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "konnte erweiterte Pseudo-Merge-Tabelle für Commit %s nicht lesen" + msgid "could not start `log`" msgstr "Konnte `log` nicht starten." @@ -19778,11 +20056,18 @@ msgstr "Log für Referenz %s unerwartet bei %s beendet." msgid "log for %s is empty" msgstr "Log für %s ist leer." +msgid "refusing to force and skip creation of reflog" +msgstr "Erzwingen der Aktion verweigert; überspringe Erstellung des Reflogs" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "Aktualisierung von Pseudoreferenz '%s' verweigert" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s" @@ -19815,6 +20100,27 @@ msgid "could not delete references: %s" msgstr "konnte Referenzen nicht entfernen: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "" +"Trockenlauf der Migration von Referenzen abgeschlossen. Das Ergebnis kann " +"unter '%s' gefunden werden.\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "konnte das temporäre Migrationsverzeichnis '%s' nicht entfernen" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "migrierte Referenzen befinden sich unter '%s'" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"kann Referenz '%s' nicht sperren: erwartete symbolische Referenz mit Ziel " +"'%s': ist aber eine reguläre Referenz" + +#, c-format msgid "refname is dangerous: %s" msgstr "Referenzname ist gefährlich: %s" @@ -20993,6 +21299,50 @@ msgstr "" "refs/heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' akzeptiert keine Merge-Commits" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick' nimmt keinen Merge-Commit an. Wenn Sie den Merge wiederholen\n" +"wollen, verwenden Sie 'merge -C' auf den Commit." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword' erfordert keinen Merge-Commit. Wenn Sie\n" +"den Merge wiederholen und die Commit-Nachricht\n" +"neu formulieren wollen, verwenden Sie\n" +"'merge -c' auf den Commit" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'edit' nimmt keinen Merge-Commit an. Wenn Sie den Merge wiederholen\n" +"wollen, verwenden Sie 'merge -C' auf den Commit und dann\n" +"break', um die Kontrolle zurückzugewinnen, sodass Sie\n" +"'git commit --amend && git rebase --continue' ausführen können." + +msgid "cannot squash merge commit into another commit" +msgstr "kann einen Merge-Commit nicht mit einem anderen Commit zusammenfassen" + +#, c-format msgid "invalid command '%.*s'" msgstr "ungültiger Befehl '%.*s'" @@ -21110,9 +21460,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "kann HEAD nicht lesen" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "konnte '%s' nicht nach '%s' kopieren" +msgid "could not write commit message file" +msgstr "konnte keine Commit-Beschreibungsdatei schreiben" #, c-format msgid "" @@ -21522,6 +21871,18 @@ msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln." msgid "failed to stat '%*s%s%s'" msgstr "Konnte '%*s%s%s' nicht lesen." +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"dubiose Besitzverhältnisse im Repository bei '%s' entdeckt\n" +"%sUm eine Ausnahme für dieses Verzeichnis hinzuzufügen, rufen Sie auf:\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." @@ -21543,18 +21904,6 @@ msgstr "" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"dubiose Besitzverhältnisse im Repository bei '%s' entdeckt\n" -"%sUm eine Ausnahme für dieses Verzeichnis hinzuzufügen, rufen Sie auf:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "" "kann Bare-Repository '%s' nicht verwenden (safe.bareRepository ist '%s')" @@ -21862,6 +22211,14 @@ msgstr "" "Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten." #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "erwartete, dass '%.*s' im Submodulpfad '%s' kein symbolischer Link ist" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "erwartete, dass der Submodulpfad '%s' kein symbolischer Link ist" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -21900,10 +22257,6 @@ msgstr "'lstat' für '%s' fehlgeschlagen" msgid "no remote configured to get bundle URIs from" msgstr "kein Remote-Repository zum Erhalten von Bundle-URIs konfiguriert" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "Remote-Repository '%s' hat keine konfigurierte URL" - msgid "could not get the bundle-uri list" msgstr "konnte die Bundle-uri-Liste nicht erhalten" @@ -23459,24 +23812,24 @@ msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Probeversand %s\n" +msgid "Dry-Sent %s" +msgstr "Probeversand %s" #, perl-format -msgid "Sent %s\n" -msgstr "%s gesendet\n" +msgid "Sent %s" +msgstr "%s gesendet" -msgid "Dry-OK. Log says:\n" -msgstr "Probeversand OK. Log enthält:\n" +msgid "Dry-OK. Log says:" +msgstr "Probelauf OK. Das Protokoll enthält:" -msgid "OK. Log says:\n" -msgstr "OK. Log enthält:\n" +msgid "OK. Log says:" +msgstr "OK. Das Protokoll enthält:" msgid "Result: " msgstr "Ergebnis: " -msgid "Result: OK\n" -msgstr "Ergebnis: OK\n" +msgid "Result: OK" +msgstr "Ergebnis: OK" #, perl-format msgid "can't open file %s" @@ -80,8 +80,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-16 22:57+0000\n" -"PO-Revision-Date: 2024-04-20 17:11+0800\n" +"POT-Creation-Date: 2024-07-17 21:57+0000\n" +"PO-Revision-Date: 2024-07-19 20:25+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -642,6 +642,10 @@ msgstr "" "p - afficher la section actuelle\n" "? - afficher l'aide\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "une seule lettre est attendue, mais '%s' a été reçu" + msgid "No previous hunk" msgstr "Pas de section précédente" @@ -690,9 +694,19 @@ msgstr "Découpée en %d sections." msgid "Sorry, cannot edit this hunk" msgstr "Désolé, impossible d'éditer cette section" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "commande inconnue : '%s' (utilisez '?' pour de l'aide)" + msgid "'git apply' failed" msgstr "'git apply' a échoué" +msgid "No changes." +msgstr "Aucune modification." + +msgid "Only binary files changed." +msgstr "Seuls des fichiers binaires ont changé." + #, c-format msgid "" "\n" @@ -1219,10 +1233,6 @@ msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." #, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "troncature du nom de fichier .rej en %.*s.rej" - -#, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" @@ -1573,6 +1583,9 @@ msgstr "fichier gitattributes trop gros ignoré '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "blob gitattributes trop gros ignoré '%s'" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "impossible d'utiliser --attr-source ou GIT_ATTR_SOURCE sans dépôt" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "mauvais --attr-source ou GIT_ATTR_SOURCE" @@ -1654,6 +1667,10 @@ msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" #, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "impossible de démarrer 'show' pour l'objet '%s'" + +#, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" @@ -1887,13 +1904,6 @@ msgstr "impossible de chmod %cx '%s'" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"le réglage add.interactive.useBuiltin a été supprimé !\n" -"Référez-vous à cette entrée dans 'git help config' pour plus de détails." - msgid "could not read the index" msgstr "impossible de lire l'index" @@ -2006,7 +2016,7 @@ msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" msgid "Use -f if you really want to add them." -msgstr "Utilisez -f si vous voulez vraiment les ajouter" +msgstr "Utilisez -f si vous voulez vraiment les ajouter<." msgid "adding files failed" msgstr "échec de l'ajout de fichiers" @@ -2340,6 +2350,9 @@ msgstr "abandonne l'opération de patch mais garde HEAD où il est" msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" +msgid "try to apply current patch again" +msgstr "essayer d'appliquer de nouveau la rustine" + msgid "record the empty patch as an empty commit" msgstr "enregistrer la rustine vide comme un commit vide" @@ -2398,9 +2411,6 @@ msgstr "git apply [<options>] [<patch>...]" msgid "could not redirect output" msgstr "impossible de rediriger la sortie" -msgid "git archive: Remote with no URL" -msgstr "git archive : Dépôt distant sans URL" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu" @@ -3321,6 +3331,9 @@ msgstr "La création d'un colis requiert un dépôt." msgid "do not show bundle details" msgstr "ne pas afficher les détails du colis" +msgid "need a repository to verify a bundle" +msgstr "la vérification d'un colis requiert un dépôt" + #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" @@ -4351,6 +4364,14 @@ msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "le lien dur ne peut pas être vérifier à '%s'" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "le lien dur est différent de la source à '%s'" + +#, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" @@ -5195,15 +5216,53 @@ msgstr "" "d'index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer." -msgid "git config [<options>]" -msgstr "git config [<options>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "" +"git config list [<option-de-fichier>] [<option-d-affichage>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "argument --type non reconnu, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<option-de-fichier>] [<option-d-affichage>] [--includes] [--" +"all] [--regexp=<regexp>] [--value=<valeur>] [--fixed-value] [--" +"default=<défaut>] <name>" -msgid "only one type at a time" -msgstr "qu'un seul type à la fois" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<option-de-fichier>] [--type=<type>] [--all] [--" +"value=<valeur>] [--fixed-value] <nom> <valeur>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<option-de-fichier>] [--all] [--value=<valeur>] [--fixed-" +"value] <nom> <valeur>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "" +"git config rename-section [<option-de-fichier>] <ancien-nom> <nouveau-nom>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<option-de-fichier>] <nom>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<option-de-fichier>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "" +"git config [<option-de-fichier>] --get-colorbool <nom> [<stdout-est-tty>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<option-de-fichier>] [--type=<type>] [--comment=<message>] " +"[--all] [--value=<valeur>] [--fixed-value] <nom> <valeur>" msgid "Config file location" msgstr "Emplacement du fichier de configuration" @@ -5229,56 +5288,6 @@ msgstr "blob-id" msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -msgid "Action" -msgstr "Action" - -msgid "get value: name [value-pattern]" -msgstr "obtenir la valeur : nom [motif-de-valeur]" - -msgid "get all values: key [value-pattern]" -msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "" -"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" - -msgid "add a new variable: name value" -msgstr "ajouter une nouvelle variable : nom valeur" - -msgid "remove a variable: name [value-pattern]" -msgstr "supprimer une variable : nom [motif-de-valeur]" - -msgid "remove all matches: name [value-pattern]" -msgstr "supprimer toutes les correspondances nom [motif-de-valeur]" - -msgid "rename section: old-name new-name" -msgstr "renommer une section : ancien-nom nouveau-nom" - -msgid "remove a section: name" -msgstr "supprimer une section : nom" - -msgid "list all" -msgstr "afficher tout" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "" -"utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" - -msgid "open an editor" -msgstr "ouvrir un éditeur" - -msgid "find the color configured: slot [default]" -msgstr "trouver la couleur configurée : slot [par défaut]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" - msgid "Type" msgstr "Type" @@ -5306,8 +5315,8 @@ msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" -msgid "Other" -msgstr "Autre" +msgid "Display options" +msgstr "Options d'affichage" msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" @@ -5315,9 +5324,6 @@ msgstr "terminer les valeurs avec un caractère NUL" msgid "show variable names only" msgstr "n'afficher que les noms de variable" -msgid "respect include directives on lookup" -msgstr "respecter les directives d'inclusion lors de la recherche" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " @@ -5328,16 +5334,15 @@ msgstr "" "afficher la portée de configuration (arbre de travail, local, global, " "système, commande)" -msgid "value" -msgstr "valeur" +msgid "show config keys in addition to their values" +msgstr "afficher les clés de configuration en plus des valeurs" -msgid "with --get, use default value when missing entry" -msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "argument --type non reconnu, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "" -"chaîne des commentaires lisibles par l'utilisateur (# sera ajouté en préfixe " -"selon les besoins)" +msgid "only one type at a time" +msgstr "qu'un seul type à la fois" #, c-format msgid "wrong number of arguments, should be %d" @@ -5414,47 +5419,77 @@ msgstr "" "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " "détails" -msgid "--get-color and variable type are incoherent" -msgstr "--get-color et le type de la variable sont incohérents" +msgid "Other" +msgstr "Autre" -msgid "only one action at a time" -msgstr "une seule action à la fois" +msgid "respect include directives on lookup" +msgstr "respecter les directives d'inclusion lors de la recherche" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "lecture du fichier de configuration '%s' impossible" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" +msgid "error processing config file(s)" +msgstr "erreur lors du traitement de fichier(s) de configuration" + +msgid "Filter options" +msgstr "Options de filtre" + +msgid "return all values for multi-valued config options" msgstr "" -"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" -"list" +"renvoyer toutes les valeurs pour les options de configuration multi-valeurs" -msgid "--default is only applicable to --get" -msgstr "--default n'est applicable qu'avec --get" +msgid "interpret the name as a regular expression" +msgstr "interpréter le nom comme une expression régulière" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment n'est applicable qu'avec les opérations add/set/replace" +msgid "show config with values matching the pattern" +msgstr "afficher les configurations dont le nom correspond au motif" + +msgid "use string equality when comparing values to value pattern" +msgstr "" +"utiliser l'égalité de chaînes lors de la comparaison des valeurs au motif de " +"valeur" + +msgid "URL" +msgstr "URL" + +msgid "show config matching the given URL" +msgstr "afficher les configs qui correspondent à l'URL donné" + +msgid "value" +msgstr "valeur" + +msgid "use default value when missing entry" +msgstr "utiliser le valeur par défaut quand l'entrée n'existe pas" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'" -#, c-format -msgid "unable to read config file '%s'" -msgstr "lecture du fichier de configuration '%s' impossible" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= ne peut pas être utilisé avec --all ou --url=" -msgid "error processing config file(s)" -msgstr "erreur lors du traitement de fichier(s) de configuration" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= ne peut pas être utilisé avec --all, --regexp ou --value" -msgid "editing stdin is not supported" -msgstr "l'édition de stdin n'est pas supportée" +msgid "Filter" +msgstr "Filtre" -msgid "editing blobs is not supported" -msgstr "l'édition de blobs n'est pas supportée" +msgid "replace multi-valued config option with new value" +msgstr "remplacer l'option de config multi-valeur par la nouvelle valeur" -#, c-format -msgid "cannot create configuration file %s" -msgstr "création impossible du fichier de configuration '%s'" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "" +"chaîne des commentaires lisibles par l'utilisateur (# sera ajouté en préfixe " +"selon les besoins)" + +msgid "add a new line without altering any existing values" +msgstr "ajouter une nouvelle ligne sans modifier les valeurs existantes" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value ne s'applique qu'avec --value=<motif>" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append ne s'applique pas avec --value=<motif>" #, c-format msgid "" @@ -5468,6 +5503,87 @@ msgstr "" msgid "no such section: %s" msgstr "section inexistante : %s" +msgid "editing stdin is not supported" +msgstr "l'édition de stdin n'est pas supportée" + +msgid "editing blobs is not supported" +msgstr "l'édition de blobs n'est pas supportée" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "création impossible du fichier de configuration '%s'" + +msgid "Action" +msgstr "Action" + +msgid "get value: name [<value-pattern>]" +msgstr "obtenir la valeur : nom [<motif-de-valeur>]" + +msgid "get all values: key [<value-pattern>]" +msgstr "obtenir toutes les valeurs : clé [<motif-de-valeur>]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "obtenir les valeur pour la regexp : name-regex [<motif-de-valeur>]" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "" +"remplacer toutes les variables correspondant : nom valeur [<motif-de-valeur>]" + +msgid "add a new variable: name value" +msgstr "ajouter une nouvelle variable : nom valeur" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "supprimer une variable : nom [<motif-de-valeur>]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "supprimer toutes les correspondances nom [<motif-de-valeur>]" + +msgid "rename section: old-name new-name" +msgstr "renommer une section : ancien-nom nouveau-nom" + +msgid "remove a section: name" +msgstr "supprimer une section : nom" + +msgid "list all" +msgstr "afficher tout" + +msgid "open an editor" +msgstr "ouvrir un éditeur" + +msgid "find the color configured: slot [<default>]" +msgstr "trouver la couleur configurée : slot [<valeur-par-défaut>]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "trouver le réglage de la couleur : slot [<stdout-est-tty>]" + +msgid "with --get, use default value when missing entry" +msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas" + +msgid "--get-color and variable type are incoherent" +msgstr "--get-color et le type de la variable sont incohérents" + +msgid "no action specified" +msgstr "aucune action spécifiée" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" +"list" + +msgid "--default is only applicable to --get" +msgstr "--default n'est applicable qu'avec --get" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment n'est applicable qu'avec les opérations add/set/replace" + msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" @@ -6307,6 +6423,9 @@ msgstr "config" msgid "config key storing a list of repository paths" msgstr "clé de config qui stocke la liste des chemins de dépôts" +msgid "keep going even if command fails in a repository" +msgstr "continuer mêm si la commande échoue dans un dépôt" + msgid "missing --config=<config>" msgstr "--config=<config> manquant" @@ -7788,8 +7907,11 @@ msgstr "marquer la série comme une Nième réédition" msgid "max length of output filename" msgstr "taille maximum du nom du fichier de sortie" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "ajouter <rfc> (par défaut 'RFC') avant 'PATCH'" msgid "cover-from-description-mode" msgstr "cover-from-description-mode" @@ -8066,11 +8188,11 @@ msgstr "" "deduplicate, --eol" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--brances] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<clé>]\n" " [--symref] [<dépôt> [<motif>...]]" @@ -8086,8 +8208,11 @@ msgstr "chemin vers git-upload-pack sur le serveur distant" msgid "limit to tags" msgstr "limiter aux étiquettes" -msgid "limit to heads" -msgstr "limiter aux heads" +msgid "limit to branches" +msgstr "limiter aux branches" + +msgid "deprecated synonym for --branches" +msgstr "synonyme obsolète de --branches" msgid "do not show peeled tags" msgstr "ne pas afficher les étiquettes pelées" @@ -8938,10 +9063,6 @@ msgstr "git notes prune [<options>]" msgid "Write/edit the notes for the following object:" msgstr "Écrire/éditer les notes pour l'objet suivant :" -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "impossible de démarrer 'show' pour l'objet '%s'" - msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" @@ -10779,6 +10900,22 @@ msgstr "pas de journal de références à supprimer spécifié" msgid "invalid ref format: %s" msgstr "format de référence invalide : %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<format> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "spécifier le format de réference vers lequel convertir" + +msgid "perform a non-destructive dry-run" +msgstr "faire l'action en mode simulé non destructif" + +msgid "missing --ref-format=<format>" +msgstr "--ref-format=<format> manquant" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "le dépôt utilise déjà le format '%s'" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11067,9 +11204,6 @@ msgstr "* distant %s" msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -msgid "(no URL)" -msgstr "(pas d'URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -11078,6 +11212,9 @@ msgstr "(pas d'URL)" msgid " Push URL: %s" msgstr " URL push : %s" +msgid "(no URL)" +msgstr "(pas d'URL)" + #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" @@ -11187,10 +11324,6 @@ msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" msgid "return all URLs" msgstr "retourner toutes les URLs" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "aucune URL configurée pour le dépôt distant '%s'" - msgid "manipulate push URLs" msgstr "manipuler les URLs push" @@ -12209,12 +12342,12 @@ msgstr "Algorithme d'empreinte inconnu" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<motif>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<motif>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -12237,11 +12370,13 @@ msgstr "la référence n'existe pas" msgid "failed to look up reference" msgstr "échec de la recherche de la référence" -msgid "only show tags (can be combined with heads)" -msgstr "afficher seulement les étiquettes (peut être combiné avec heads)" +msgid "only show tags (can be combined with branches)" +msgstr "" +"afficher seulement les étiquettes (peut être combiné avec les branches)" -msgid "only show heads (can be combined with tags)" -msgstr "afficher seulement les têtes (peut être combiné avec tags)" +msgid "only show branches (can be combined with tags)" +msgstr "" +"afficher seulement les branches (peut être combiné avec les étiquettes)" msgid "check for reference existence without resolving" msgstr "vérifier l'existence de la référence sans la résoudre" @@ -12893,14 +13028,14 @@ msgstr "" "refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué" - -#, c-format msgid "directory not empty: '%s'" msgstr "le répertoire n'est pas vide : '%s'" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" @@ -13266,9 +13401,11 @@ msgstr "raison de la mise à jour" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>] [-e]\n" +" [(--trailer <jeton>[(=|:)<valeur>)...]\n" " <nom-d-étiquette> [<commit> | <objet>]" msgid "git tag -d <tagname>..." @@ -14147,9 +14284,6 @@ msgstr "en-tête non reconnu : %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -msgid "need a repository to verify a bundle" -msgstr "la vérification d'un colis requiert un dépôt" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14565,6 +14699,9 @@ msgstr "Recevoir ce qui est poussé dans le dépôt" msgid "Manage reflog information" msgstr "Gérer l'information de reflog" +msgid "Low-level access to refs" +msgstr "accès de bas-niveau aux réfs" + msgid "Manage set of tracked repositories" msgstr "Gérer un ensemble de dépôts suivis" @@ -14884,6 +15021,14 @@ msgstr "" "le tronçon d'étalement OID requis par le graphe de commits est manquant ou " "corrompu" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"désactivation des filtres de Bloom opur la couche de graphe de commits '%s' " +"à cause de réglages incompatibles" + msgid "commit-graph has no base graphs chunk" msgstr "le graphe de commit n'a pas de tronçon de graphes de base" @@ -15018,6 +15163,14 @@ msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"essai d'écriture de graphe de commits, mais 'commitGraph." +"changedPathsVersion' (%d) n'est pas pris en charge" + msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" @@ -16931,19 +17084,23 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <chemin>] [-c <nom>=<valeur>]\n" " [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-" "path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" -" [--config-env=<nom>=<variable-d-environnement>] <commande> " -"[<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-" +"dir=<chemin>]\n" +" [--work-tree=<chemin>] [--namespace=<nom>] [--config-" +"env=<nom>=<var-d-env>] \n" +" <commande> [<args>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -17284,13 +17441,13 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." +msgid "not a git repository" +msgstr "pas un dépôt git" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)" -msgid "not a git repository" -msgstr "pas un dépôt git" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "" @@ -17302,6 +17459,9 @@ msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.39.0" +msgid "Unknown value for http.proactiveauth" +msgstr "valeur inconnue pour http.proactiveauth" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0" @@ -17319,6 +17479,12 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "refus de lire des cookies depuis http.cookiefile '-'" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "http.savecookies ignoré pour http.cookiefile vide" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -17481,6 +17647,10 @@ msgid "quoted CRLF detected" msgstr "CRLF citées détectées" #, c-format +msgid "unable to format message: %s" +msgstr "impossible de formater le message : %s" + +#, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" @@ -17493,8 +17663,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "Échec de la fusion du sous-module %s (dépôt corrompu)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "erreur : échec de la fusion du sous-module %s (dépôt corrompu)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17526,12 +17696,13 @@ msgstr "" "existent :\n" "%s" -msgid "failed to execute internal merge" -msgstr "échec à l'exécution de la fusion interne" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "erreur : échec à l'exécution de la fusion interne pour %s" #, c-format -msgid "unable to add %s to database" -msgstr "impossible d'ajouter %s à la base de données" +msgid "error: unable to add %s to database" +msgstr "erreur : impossible d'ajouter %s à la base de données" #, c-format msgid "Auto-merging %s" @@ -17627,12 +17798,12 @@ msgstr "" "supprimé dans %s." #, c-format -msgid "cannot read object %s" -msgstr "impossible de lire l'objet %s" +msgid "error: cannot read object %s" +msgstr "erreur : impossible de lire l'objet %s" #, c-format -msgid "object %s is not a blob" -msgstr "l'objet %s n'est pas un blob" +msgid "error: object %s is not a blob" +msgstr "erreur : l'objet %s n'est pas un blob" #, c-format msgid "" @@ -17771,6 +17942,10 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "Échec de la fusion du sous-module %s (dépôt corrompu)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" @@ -17810,6 +17985,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" +msgid "failed to execute internal merge" +msgstr "échec à l'exécution de la fusion interne" + +#, c-format +msgid "unable to add %s to database" +msgstr "impossible d'ajouter %s à la base de données" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -17910,6 +18092,14 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" +#, c-format +msgid "cannot read object %s" +msgstr "impossible de lire l'objet %s" + +#, c-format +msgid "object %s is not a blob" +msgstr "l'objet %s n'est pas un blob" + msgid "modify" msgstr "modification" @@ -17993,10 +18183,6 @@ msgstr "impossible d'analyser la ligne : %s" msgid "malformed line: %s" msgstr "ligne malformée : %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "" -"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" - msgid "could not load pack" msgstr "impossible de charger le paquet" @@ -18004,6 +18190,10 @@ msgstr "impossible de charger le paquet" msgid "could not open index for %s" msgstr "impossible d'ouvrir l'index pour %s" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" +"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" + msgid "Adding packfiles to multi-pack-index" msgstr "Ajout de fichiers paquet à un index multi-paquet" @@ -18628,6 +18818,17 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "entrée dupliquée dans l'index en bitmap : '%s'" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "essai de stockage d'un commit non-sélectionné : '%s'" + +msgid "too many pseudo-merges" +msgstr "trop de pseudo-fusions" + msgid "trying to write commit not in index" msgstr "échec de l'écriture de l'objet commit absent de l'index" @@ -18654,6 +18855,20 @@ msgstr "" "fichier d'index en bitmap corrompu (trop court pour correspondre à une table " "de recherche)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"fichier d'index en bitmap corrompu (trop court pour correspondre à un entête " +"de table de pseudo-fusion)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" +"fichier d'index en bitmap corrompu (trop court pour correspondre à une table " +"de pseudo-fusion)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "fichier d'index en bitmap corrompu, table de pseudo-fusion trop courte" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "entrée dupliquée dans l'index en bitmap : '%s'" @@ -18713,6 +18928,9 @@ msgstr "bitmap ewah corrompue : entête tronqué pour la bitmap du commit '%s'" msgid "unable to load pack: '%s', disabling pack-reuse" msgstr "impossible de charger le paquet : '%s', pack-reuse désactivé" +msgid "unable to compute preferred pack, disabling pack-reuse" +msgstr "impossible de calculer le paquet préféré, pack-reuse désactivé" + #, c-format msgid "object '%s' not found in type bitmaps" msgstr "objet '%s' non trouvé dans les bitmaps de type" @@ -18743,6 +18961,10 @@ msgid "mismatch in bitmap results" msgstr "décalage dans le résultats de bitmap" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "l'index de pseudo-fusion est hors-limite (%<PRIu32> ≥ %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "impossible de trouver '%s' dans le paquet '%s' à l'offset %<PRIuMAX>" @@ -19115,6 +19337,11 @@ msgstr "impossible de créer le lstat en fil : %s" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "" +"récupération paresseuse désactivée ; certains objets pourraient ne pas être " +"disponibles" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "" "promisor-remote : impossible de créer un sous-processus de récupération" @@ -19142,6 +19369,68 @@ msgstr "object-info : vidage attendu après les arguments" msgid "Removing duplicate objects" msgstr "Suppression des objets dupliqués" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "impossible de charger la regex de pseudo-fusion pour %s : '%s'" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s doit être non négatif, utilisation de la valeur par défaut" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s doit valoir entre 0 et 1, utilisation de la valeur par défaut" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s doit être positif, utilisation de la valeur par défaut" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "le groupe de pseudo-fusion '%s' n'a pas de motif requis" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "" +"le group de pseudo-fusion '%s' a un seuil instable avec un seuil stable" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"l'expression rationnelle de pseudo-fusion a trop de groupes de capture " +"(max=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"la lecture de la pseudo-fusion étendue est hors-limite " +"(%<PRIuMAX>=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"l'entrée de pseudo-fusion étendue est trop courte (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "" +"impossible de trouver la pseudo-fusion pour le commit '%s' à l'offset " +"%<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "recherche de pseudo-fusion étendue hors-limite (%<PRIu32> ≥ %<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "lecture hors-limite : (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "" +"impossible de lire la table de pseudo-fusions étendues pour le commit %s" + msgid "could not start `log`" msgstr "impossible de démarrer `log`" @@ -19749,11 +20038,18 @@ msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" +msgid "refusing to force and skip creation of reflog" +msgstr "refus de forcer et sauter la création du reflog" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "refus de mettre à jour la pseudo-réf '%s'" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" @@ -19784,6 +20080,26 @@ msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "" +"Migration simulée des réfs terminée, le résultat peut être trouvé à '%s'\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "impossible de supprimer le répetoire de migration temporaire '%s'" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "les références migrées peuvent être trouvées dans '%s'" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"impossible de vérrouiller '%s' : symref attendu avec la cible '%s', mais réf " +"normale trouvée" + +#, c-format msgid "refname is dangerous: %s" msgstr "le nom de réference est dangereux : %s" @@ -20963,6 +21279,49 @@ msgstr "" "heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' n'accepte pas de commit de fusion" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick' n'accepte pas de commit de fusion. Si vous voulez\n" +"rejouer la fusion, utilisez 'merge -C' sur le commit." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword' n'accepte pas de commit de fusion.\n" +"Si vous vouliez rejouer la fusion et la reformuler,\n" +"utilisez 'merge -c' sur le commit" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'edit' n'accepte pas de commit de fusion. Si vous vouliez\n" +"rejouer la fusion, utilisez 'merge -C' sur le commit, puis\n" +"'break' pour vous redonner le contrôle pour pouvoir faire\n" +"'git commit --amend && git rebase --continue'." + +msgid "cannot squash merge commit into another commit" +msgstr "impossible d'écraser un commit de fusion avec un autre commit" + +#, c-format msgid "invalid command '%.*s'" msgstr "commande '%.*s' invalide" @@ -21079,9 +21438,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "impossible de copier '%s' vers '%s'" +msgid "could not write commit message file" +msgstr "impossible d'écrire le fichier de message de validation" #, c-format msgid "" @@ -21487,6 +21845,18 @@ msgstr "impossible de revenir au répertoire de travail courant" msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"propriétaire douteux détecté dans le dépôt à '%s'\n" +"%sPour ajouter une exception pour ce dépôt, lancez :\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" @@ -21509,18 +21879,6 @@ msgstr "" "n'est pas défini)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"propriétaire douteux détecté dans le dépôt à '%s'\n" -"%sPour ajouter une exception pour ce dépôt, lancez :\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "impossible d'utiliser le dépôt nu '%s' (safe.bareRepository vaut '%s')" @@ -21830,6 +22188,16 @@ msgstr "" "'%.*s'" #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"'%.*s' dans le chemin du sous-module '%s' ne devait pas être un lien " +"symbolique" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "le chemin du sous-module '%s' ne devait pas être un lien symbolique" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -21868,10 +22236,6 @@ msgstr "échec du lstat de '%s'" msgid "no remote configured to get bundle URIs from" msgstr "aucun distant configuré depuis lequel récupérer des URIs de colis" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "le distant '%s' n'a pas d'URL configuré" - msgid "could not get the bundle-uri list" msgstr "impossible d'avoir la liste de bundle-uris" @@ -23374,24 +23738,24 @@ msgid "Failed to send %s\n" msgstr "Échec de l'envoi de %s\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Envoi simulé de %s\n" +msgid "Dry-Sent %s" +msgstr "Envoi simulé de %s" #, perl-format -msgid "Sent %s\n" -msgstr "%s envoyé\n" +msgid "Sent %s" +msgstr "%s envoyé" -msgid "Dry-OK. Log says:\n" -msgstr "Simulation OK. Le journal indique :\n" +msgid "Dry-OK. Log says:" +msgstr "Simulation OK. Le journal indique :" -msgid "OK. Log says:\n" -msgstr "OK. Le journal indique :\n" +msgid "OK. Log says:" +msgstr "OK. Le journal indique :" msgid "Result: " msgstr "Résultat : " -msgid "Result: OK\n" -msgstr "Résultat : OK\n" +msgid "Result: OK" +msgstr "Résultat : OK" #, perl-format msgid "can't open file %s" @@ -23466,6 +23830,38 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#, c-format +#~ msgid "truncating .rej filename to %.*s.rej" +#~ msgstr "troncature du nom de fichier .rej en %.*s.rej" + +#~ msgid "" +#~ "the add.interactive.useBuiltin setting has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "le réglage add.interactive.useBuiltin a été supprimé !\n" +#~ "Référez-vous à cette entrée dans 'git help config' pour plus de détails." + +#~ msgid "git archive: Remote with no URL" +#~ msgstr "git archive : Dépôt distant sans URL" + +#~ msgid "only one action at a time" +#~ msgstr "une seule action à la fois" + +#~ msgid "use [RFC PATCH] instead of [PATCH]" +#~ msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" + +#, c-format +#~ msgid "no URLs configured for remote '%s'" +#~ msgstr "aucune URL configurée pour le dépôt distant '%s'" + +#, c-format +#~ msgid "unable to copy '%s' to '%s'" +#~ msgstr "impossible de copier '%s' vers '%s'" + +#, c-format +#~ msgid "remote '%s' has no configured URL" +#~ msgstr "le distant '%s' n'a pas d'URL configuré" + #~ msgid "" #~ "Use -f if you really want to add them.\n" #~ "Turn this message off by running\n" @@ -23509,9 +23905,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ msgid "core.commentChar should only be one ASCII character" #~ msgstr "core.commentChar ne devrait être qu'un unique caractère ASCII" -#~ msgid "-x and -X cannot be used together" -#~ msgstr "-x et -X ne peuvent pas être utilisés ensemble" - #~ msgid "" #~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" #~ "exclude" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-25 18:57+0000\n" -"PO-Revision-Date: 2024-04-26 15:33+0700\n" +"POT-Creation-Date: 2024-07-19 14:03+0700\n" +"PO-Revision-Date: 2024-07-19 14:25+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -104,12 +104,12 @@ msgstr[1] "%d jalur ditambahkan\n" msgid "ignoring unmerged: %s" msgstr "mengabaikan tak tergabung: %s" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "Only binary files changed.\n" msgstr "Hanya berkas biner yang berubah.\n" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "No changes.\n" msgstr "Tidak ada perubahan.\n" @@ -666,6 +666,11 @@ msgstr "" "? - lihat bantuan\n" #: add-patch.c +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Hanya satu huruf yang diharapkan, dapat '%s'" + +#: add-patch.c msgid "No previous hunk" msgstr "Tidak ada bingkah sebelumnya" @@ -728,9 +733,22 @@ msgid "Sorry, cannot edit this hunk" msgstr "Maaf, tidak dapat menyunting bingkah ini" #: add-patch.c +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Perintah tidak dikenal '%s' (gunakan '?' untuk bantuan)" + +#: add-patch.c msgid "'git apply' failed" msgstr "'git apply' gagal" +#: add-patch.c +msgid "No changes." +msgstr "Tidak ada perubahan." + +#: add-patch.c +msgid "Only binary files changed." +msgstr "Hanya berkas biner yang berubah." + #: advice.c #, c-format msgid "" @@ -911,7 +929,7 @@ msgid "unclosed quote" msgstr "tanda kutip tak ditutup" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "terlalu banyak argumen" @@ -1808,6 +1826,11 @@ msgid "ignoring overly large gitattributes blob '%s'" msgstr "mengabaikan blob gitattributes '%s' yang terlalu besar" #: attr.c +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "" +"tidak dapat menggunakan --attr-source atau GIT_ATTR_SOURCE tanpa repositori" + +#: attr.c msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "--attr-source atau GIT_ATTR_SOURCE jelek" @@ -2183,14 +2206,6 @@ msgid "Unstaged changes after refreshing the index:" msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" #: builtin/add.c -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"setelan add.interactive.useBuiltin sudah dihapus!\n" -"Selengkapnya lihat entrinya di 'git help config'." - -#: builtin/add.c msgid "could not read the index" msgstr "tidak dapat membaca indeks" @@ -2644,7 +2659,7 @@ msgstr "" "Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n" "Tidak memutar ulang ke ORIG_HEAD" -#: builtin/am.c builtin/bisect.c worktree.c +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "gagal membaca '%s'" @@ -2722,8 +2737,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c +#: builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "format" @@ -2760,6 +2775,10 @@ msgid "show the patch being applied" msgstr "perlihatkan tambalan yang diterapkan" #: builtin/am.c +msgid "try to apply current patch again" +msgstr "coba terapkan lagi tambalan saat ini" + +#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "rekam tambalan kosong sebagai komit kosong" @@ -2832,10 +2851,6 @@ msgid "could not redirect output" msgstr "tidak dapat mengalihkan keluaran" #: builtin/archive.c -msgid "git archive: Remote with no URL" -msgstr "git archive: Remote tanpa URL" - -#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: ACK/NAK diharapkan, dapat paket bilasan" @@ -3960,6 +3975,10 @@ msgstr "Perlu sebuah repositori untuk membuat bundel." msgid "do not show bundle details" msgstr "jangan perlihatkan detail bundel" +#: builtin/bundle.c bundle.c +msgid "need a repository to verify a bundle" +msgstr "perlu sebuah repositori untuk verifikasi bundel" + #: builtin/bundle.c #, c-format msgid "%s is okay\n" @@ -5018,9 +5037,9 @@ msgstr "pembersihan interaktif" msgid "remove whole directories" msgstr "hapus keseluruhan direktori" -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c -#: ref-filter.h +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c +#: builtin/show-ref.c ref-filter.h msgid "pattern" msgstr "pola" @@ -5239,6 +5258,16 @@ msgstr "gagal menghapus tautan '%s'" #: builtin/clone.c #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "tautan keras tidak dapat diperiksa pada '%s'" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "tautan keras berbeda dari sumber pada '%s'" + +#: builtin/clone.c +#, c-format msgid "failed to create link '%s'" msgstr "gagal membuat tautan '%s'" @@ -5313,7 +5342,7 @@ msgstr "Terlalu banyak argumen." msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." -#: builtin/clone.c builtin/init-db.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "format penyimpanan referensi tidak dikenal '%s'" @@ -5936,7 +5965,7 @@ msgstr "%sPengkomit: %.*s <%.*s>" msgid "Cannot read index" msgstr "Tidak dapat membaca indeks" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" msgstr "tidak dapat melewatkan trailer ke --trailers" @@ -6152,11 +6181,11 @@ msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)" -#: builtin/commit.c builtin/interpret-trailers.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c msgid "trailer" msgstr "trailer" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "add custom trailer(s)" msgstr "tambahkan trailer kustom" @@ -6269,17 +6298,58 @@ msgstr "" "tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan." #: builtin/config.c -msgid "git config [<options>]" -msgstr "git config [<opsi>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<opsi berkas>] [<opsi tampilan>] [--includes]" #: builtin/config.c -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "argumen --type tidak dikenal %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<opsi berkas>] [<opsi tampilan] [--includes] [--all] [--" +"regexp=<regexp> [--value=<nilai>] [--fixed-value] [--default=<default>] " +"<nama>" #: builtin/config.c -msgid "only one type at a time" -msgstr "hanya satu tipe pada suatu saat" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<opsi berkas>] [--type=<tipe>] [--all] [--value=<nilai>] [--" +"fixed-value] <nama> <nilai>" + +#: builtin/config.c +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<opsi berkas] [--all] [--value=<nilai>] [--fixed-value] " +"<nama> <nilai>" + +#: builtin/config.c +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<opsi berkas>] <nama lama> <nama baru>" + +#: builtin/config.c +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<opsi berkas>] <nama>" + +#: builtin/config.c +msgid "git config edit [<file-option>]" +msgstr "git config edit [<opsi berkas>]" + +#: builtin/config.c +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<opsi berkas>] --get-colorbool <nama> [<stdout-is-tty>]" + +#: builtin/config.c +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<opsi berkas>] [--type=<tipe>] [--comment=<pesan>] [--all] " +"[--value=<nilai>] [--fixed-value] <nama> <nilai>" #: builtin/config.c msgid "Config file location" @@ -6314,70 +6384,6 @@ msgid "read config from given blob object" msgstr "baca konfigurasi dari objek blob yang diberikan" #: builtin/config.c -msgid "Action" -msgstr "Tindakan" - -#: builtin/config.c -msgid "get value: name [value-pattern]" -msgstr "dapatkan nilai: name [pola nilai]" - -#: builtin/config.c -msgid "get all values: key [value-pattern]" -msgstr "dapatkan semua nilai: key [pola nilai]" - -#: builtin/config.c -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "dapatkan nilai dari regexp: name-regex [pola nilai]" - -#: builtin/config.c -msgid "get value specific for the URL: section[.var] URL" -msgstr "dapatkan nilai spesifik untuk URL: section[.var] URL" - -#: builtin/config.c -msgid "replace all matching variables: name value [value-pattern]" -msgstr "ganti semua variabel yang cocok: name value [pola nilai]" - -#: builtin/config.c -msgid "add a new variable: name value" -msgstr "tambahkan variabel baru: name value" - -#: builtin/config.c -msgid "remove a variable: name [value-pattern]" -msgstr "hapus variabel: name [pola nilai]" - -#: builtin/config.c -msgid "remove all matches: name [value-pattern]" -msgstr "hapus semua cocokan: name [pola nilai]" - -#: builtin/config.c -msgid "rename section: old-name new-name" -msgstr "ganti nama bagian: old-name new-name" - -#: builtin/config.c -msgid "remove a section: name" -msgstr "hapus bagian: name" - -#: builtin/config.c -msgid "list all" -msgstr "daftar semua" - -#: builtin/config.c -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "gunakan kesamaan untai ketika membandingkan nilai ke 'pola nilai'" - -#: builtin/config.c -msgid "open an editor" -msgstr "buka penyunting" - -#: builtin/config.c -msgid "find the color configured: slot [default]" -msgstr "temukan warna terkonfigurasi: slot [asali]" - -#: builtin/config.c -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "temukan setelan warna: slot [stdout-is-tty]" - -#: builtin/config.c msgid "Type" msgstr "Tipe" @@ -6414,8 +6420,8 @@ msgid "value is an expiry date" msgstr "nilai adalah tanggal kadaluarsa" #: builtin/config.c -msgid "Other" -msgstr "Lainnya" +msgid "Display options" +msgstr "Tampilkan opsi" #: builtin/config.c msgid "terminate values with NUL byte" @@ -6426,10 +6432,6 @@ msgid "show variable names only" msgstr "perlihatkan hanya nama variabel" #: builtin/config.c -msgid "respect include directives on lookup" -msgstr "segani arahan masukkan pada pencarian" - -#: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "perlihatkan asal konfigurasi (berkas, masukan standar, blob, baris perintah)" @@ -6441,17 +6443,17 @@ msgstr "" "perintah)" #: builtin/config.c -msgid "value" -msgstr "nilai" +msgid "show config keys in addition to their values" +msgstr "perlihatkan kunci opsi beserta nilainya" #: builtin/config.c -msgid "with --get, use default value when missing entry" -msgstr "dengan --get, gunakan nilai asali ketika kehilangan entri" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "argumen --type tidak dikenal %s" #: builtin/config.c -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "" -"untai komentar yang dapat dibaca manusia (# akan ditambahkan bila diperlukan" +msgid "only one type at a time" +msgstr "hanya satu tipe pada suatu saat" #: builtin/config.c #, c-format @@ -6545,60 +6547,94 @@ msgstr "" "\"CONFIGURATION FILE\" di \"git help worktree\" untuk selengkapnya" #: builtin/config.c -msgid "--get-color and variable type are incoherent" -msgstr "--get-color dan tipe variabel raban" +msgid "Other" +msgstr "Lainnya" #: builtin/config.c -msgid "only one action at a time" -msgstr "hanya satu tindakan pada suatu saat" +msgid "respect include directives on lookup" +msgstr "segani arahan masukkan pada pencarian" #: builtin/config.c -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only hanya dapat diterapkan pada --list atau --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "tidak dapat membaca berkas konfigurasi '%s'" #: builtin/config.c -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"--show-origin hanya dapat diterapkan pada --get, --get-all, --get-regexp, " -"dan --list" +msgid "error processing config file(s)" +msgstr "kesalahan memproses berkas konfigurasi" #: builtin/config.c -msgid "--default is only applicable to --get" -msgstr "--default hanya dapat diterapkan pada --get" +msgid "Filter options" +msgstr "Opsi penyaringan" #: builtin/config.c -msgid "--comment is only applicable to add/set/replace operations" -msgstr "" -"--comment hanya dapat diterapkan pada operasi penambahan/penyetelan/" -"penggantian" +msgid "return all values for multi-valued config options" +msgstr "dapatkan semua nilai untuk opsi konfigurasi multi-nilai" + +#: builtin/config.c +msgid "interpret the name as a regular expression" +msgstr "tafsirkan nama sebagai ekspresi reguler" + +#: builtin/config.c +msgid "show config with values matching the pattern" +msgstr "perlihatkan konfigurasi dengan nilai yang cocok dengan pola" + +#: builtin/config.c +msgid "use string equality when comparing values to value pattern" +msgstr "gunakan kesamaan untai ketika membandingkan nilai dan pola nilai" + +#: builtin/config.c +msgid "URL" +msgstr "URL" + +#: builtin/config.c +msgid "show config matching the given URL" +msgstr "perlihatkan konfigurasi yang cocok dengan URL yang diberikan" + +#: builtin/config.c +msgid "value" +msgstr "nilai" + +#: builtin/config.c +msgid "use default value when missing entry" +msgstr "gunakan nilai asali ketika entri hilang" #: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value hanya diterapkan dengan 'pola nilai'" #: builtin/config.c -#, c-format -msgid "unable to read config file '%s'" -msgstr "tidak dapat membaca berkas konfigurasi '%s'" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= tidak dapat digunakan dengan --all atau --url=" #: builtin/config.c -msgid "error processing config file(s)" -msgstr "kesalahan memproses berkas konfigurasi" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= tidak dapat digunakan dengan --all, --regexp atau --value" #: builtin/config.c -msgid "editing stdin is not supported" -msgstr "menyunting stdin tidak didukung" +msgid "Filter" +msgstr "Penyaring" #: builtin/config.c -msgid "editing blobs is not supported" -msgstr "menyunting blob tidak didukung" +msgid "replace multi-valued config option with new value" +msgstr "ganti opsi konfigurasi multi-nilai dengan nilai baru" #: builtin/config.c -#, c-format -msgid "cannot create configuration file %s" -msgstr "tidak dapat membuat berkas konfigurasi %s" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "" +"untai komentar yang dapat dibaca manusia (# akan ditambahkan bila diperlukan" + +#: builtin/config.c +msgid "add a new line without altering any existing values" +msgstr "tambahkan baris baru tanpa mengubah nilai yang ada" + +#: builtin/config.c +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value hanya diterapkan dengan --value=<pola>" + +#: builtin/config.c +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append tidak dapat digunakan dengan --value=<pola>" #: builtin/config.c #, c-format @@ -6614,6 +6650,113 @@ msgstr "" msgid "no such section: %s" msgstr "tidak ada bagian seperti: %s" +#: builtin/config.c +msgid "editing stdin is not supported" +msgstr "menyunting stdin tidak didukung" + +#: builtin/config.c +msgid "editing blobs is not supported" +msgstr "menyunting blob tidak didukung" + +#: builtin/config.c +#, c-format +msgid "cannot create configuration file %s" +msgstr "tidak dapat membuat berkas konfigurasi %s" + +#: builtin/config.c +msgid "Action" +msgstr "Tindakan" + +#: builtin/config.c +msgid "get value: name [<value-pattern>]" +msgstr "dapatkan nilai: name [<pola nilai>]" + +#: builtin/config.c +msgid "get all values: key [<value-pattern>]" +msgstr "dapatkan semua nilai: key [<pola nilai>]" + +#: builtin/config.c +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "dapatkan nilai dari ekspresi reguler: name-regex [<pola nilai>]" + +#: builtin/config.c +msgid "get value specific for the URL: section[.var] URL" +msgstr "dapatkan nilai spesifik untuk URL: section[.var] URL" + +#: builtin/config.c +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "ganti semua variabel yang cocok: name value [<pola nilai>]" + +#: builtin/config.c +msgid "add a new variable: name value" +msgstr "tambahkan variabel baru: name value" + +#: builtin/config.c +msgid "remove a variable: name [<value-pattern>]" +msgstr "hapus variabel: name [<pola nilai>]" + +#: builtin/config.c +msgid "remove all matches: name [<value-pattern>]" +msgstr "hapus semua cocokan: name [<pola nilai>]" + +#: builtin/config.c +msgid "rename section: old-name new-name" +msgstr "ganti nama bagian: old-name new-name" + +#: builtin/config.c +msgid "remove a section: name" +msgstr "hapus bagian: name" + +#: builtin/config.c +msgid "list all" +msgstr "daftar semua" + +#: builtin/config.c +msgid "open an editor" +msgstr "buka penyunting" + +#: builtin/config.c +msgid "find the color configured: slot [<default>]" +msgstr "temukan warna terkonfigurasi: slot [<asali>]" + +#: builtin/config.c +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "temukan setelan warna: slot [<stdout-is-tty>]" + +#: builtin/config.c +msgid "with --get, use default value when missing entry" +msgstr "dengan --get, gunakan nilai asali ketika kehilangan entri" + +#: builtin/config.c +msgid "--get-color and variable type are incoherent" +msgstr "--get-color dan tipe variabel raban" + +#: builtin/config.c +msgid "no action specified" +msgstr "tidak ada tindakan yang dipilih" + +#: builtin/config.c +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only hanya dapat diterapkan pada --list atau --get-regexp" + +#: builtin/config.c +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin hanya dapat diterapkan pada --get, --get-all, --get-regexp, " +"dan --list" + +#: builtin/config.c +msgid "--default is only applicable to --get" +msgstr "--default hanya dapat diterapkan pada --get" + +#: builtin/config.c +msgid "--comment is only applicable to add/set/replace operations" +msgstr "" +"--comment hanya dapat diterapkan pada operasi penambahan/penyetelan/" +"penggantian" + #: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "cetak ukuran dalam format yang bisa dibaca manusia" @@ -7662,6 +7805,10 @@ msgid "config key storing a list of repository paths" msgstr "kunci konfigurasi yang menampung daftar jalur repositori" #: builtin/for-each-repo.c +msgid "keep going even if command fails in a repository" +msgstr "tetap lanjut meski perintah gagal pada repositori" + +#: builtin/for-each-repo.c msgid "missing --config=<config>" msgstr "kehilangan --config=<config>" @@ -9518,8 +9665,12 @@ msgid "max length of output filename" msgstr "panjang nama berkas keluaran maksimum" #: builtin/log.c -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "gunakan [RFC PATCH] daripada [PATCH]" +msgid "rfc" +msgstr "rfc" + +#: builtin/log.c +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "tambahkan <rfc> (asali 'RFC') sebelum 'PATCH'" #: builtin/log.c msgid "cover-from-description-mode" @@ -9870,11 +10021,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<kunci>]\n" " [--symref] [<repositori> [<pola>...]]" @@ -9895,8 +10046,12 @@ msgid "limit to tags" msgstr "batasi ke tag" #: builtin/ls-remote.c -msgid "limit to heads" -msgstr "batasi ke kepala" +msgid "limit to branches" +msgstr "batasi ke cabang" + +#: builtin/ls-remote.c builtin/show-ref.c +msgid "deprecated synonym for --branches" +msgstr "sinonim usang untuk --branches" #: builtin/ls-remote.c msgid "do not show peeled tags" @@ -13177,6 +13332,27 @@ msgstr "tidak ada log referensi yang disebutkan untuk dihapus" msgid "invalid ref format: %s" msgstr "format referensi tidak valid: %s" +#: builtin/refs.c +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<format> [--dry-run]" + +#: builtin/refs.c +msgid "specify the reference format to convert to" +msgstr "sebutkan format referensi untuk dikonversi" + +#: builtin/refs.c +msgid "perform a non-destructive dry-run" +msgstr "lakukan uji coba non desktruktif" + +#: builtin/refs.c +msgid "missing --ref-format=<format>" +msgstr "--ref-format=<format> hilang" + +#: builtin/refs.c +#, c-format +msgid "repository already uses '%s' format" +msgstr "repositori telah menggunakan format '%s'" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13530,10 +13706,6 @@ msgstr "* remote %s" msgid " Fetch URL: %s" msgstr " URL pengambilan: %s" -#: builtin/remote.c -msgid "(no URL)" -msgstr "(tidak ada URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -13544,6 +13716,10 @@ msgid " Push URL: %s" msgstr " URL pendorongan: %s" #: builtin/remote.c +msgid "(no URL)" +msgstr "(tidak ada URL)" + +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " Cabang HEAD: %s" @@ -13678,11 +13854,6 @@ msgid "return all URLs" msgstr "kembalikan semua URL" #: builtin/remote.c -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'" - -#: builtin/remote.c msgid "manipulate push URLs" msgstr "manipulasi URL pendorongan" @@ -14951,12 +15122,12 @@ msgstr "algoritma hash tidak dikenal" #: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pola>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pola>...]" #: builtin/show-ref.c msgid "" @@ -14985,12 +15156,12 @@ msgid "failed to look up reference" msgstr "gagal mencari referensi" #: builtin/show-ref.c -msgid "only show tags (can be combined with heads)" -msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan kepala)" +msgid "only show tags (can be combined with branches)" +msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan cabang)" #: builtin/show-ref.c -msgid "only show heads (can be combined with tags)" -msgstr "hanya perlihatkan kepala (bisa dikombinasikan dengan tag)" +msgid "only show branches (can be combined with tags)" +msgstr "hanya perlihatkan cabang (bisa dikombinasikan dengan tag)" #: builtin/show-ref.c msgid "check for reference existence without resolving" @@ -15765,7 +15936,7 @@ msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c submodule.c #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" @@ -15773,13 +15944,13 @@ msgstr "" #: builtin/submodule--helper.c #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" +msgid "directory not empty: '%s'" +msgstr "direktori tidak kosong: '%s'" #: builtin/submodule--helper.c #, c-format -msgid "directory not empty: '%s'" -msgstr "direktori tidak kosong: '%s'" +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" #: builtin/submodule--helper.c #, c-format @@ -16230,9 +16401,11 @@ msgstr "alasan pembaruan" #: builtin/tag.c msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan> | -F <berkas>] [-e]\n" +" [(--trailer <token>[(=|:)<nilai>])...]\n" " <nama tag> [<komit> | <objek>]" #: builtin/tag.c @@ -17292,10 +17465,6 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Repositori kekurangan komit prasyarat berikut:" #: bundle.c -msgid "need a repository to verify a bundle" -msgstr "perlu sebuah repositori untuk verifikasi bundel" - -#: bundle.c msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -17825,6 +17994,10 @@ msgid "Manage reflog information" msgstr "Kelola informasi log referensi" #: command-list.h +msgid "Low-level access to refs" +msgstr "Akses tingat bawah ke referensi" + +#: command-list.h msgid "Manage set of tracked repositories" msgstr "Kelola set repositori terlacak" @@ -18226,6 +18399,15 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "bingkah grafik komit data komit yang diperlukan hilang atau rusak" #: commit-graph.c +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"menonaktifkan penyaring Bloom untuk lapisan grafik komit '%s' karena setelan " +"yang tidak cocok" + +#: commit-graph.c msgid "commit-graph has no base graphs chunk" msgstr "grafik komit tidak punya bingkah grafik dasar" @@ -18384,6 +18566,15 @@ msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "mencoba menulis grafik komit, tapi 'core.commitGraph' dimatikan" #: commit-graph.c +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"mencoba menulis grafik komit, tapi 'commitGraph.changedPathsVersion (%d) " +"tidak didukung" + +#: commit-graph.c msgid "too many commits to write graph" msgstr "terlalu banyak komit untuk menulis grafik" @@ -20693,15 +20884,17 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v| --version] [-h | --help] [-C <jalur>] [-c <nama>=<nilai>]\n" " [--exec-path[=<jalur>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects]\n" +" [--no-lazy-fetch] [--no-optional-locks] [--no-advice] [--bare]\n" " [--git-dir=<jalur>] [--work-tree=<jalur>] [--namespace=<nama>]\n" " [--config-env=<nama>=<variabel lingkungan>]\n" " <perintah> [<argumen>]" @@ -21117,14 +21310,14 @@ msgstr "" "ignoredHook false`." #: http-fetch.c +msgid "not a git repository" +msgstr "bukan sebuah repositori git" + +#: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "argumen ke --packfile harus sebuah hash valid (dapat '%s')" -#: http-fetch.c -msgid "not a git repository" -msgstr "bukan sebuah repositori git" - #: http.c #, c-format msgid "negative value for http.postBuffer; defaulting to %d" @@ -21139,6 +21332,10 @@ msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "Penyematan kunci publik tidak didukung oleh cURL < 7.39.0" #: http.c +msgid "Unknown value for http.proactiveauth" +msgstr "nilai tidak dikenal untuk http.proactiveauth" + +#: http.c msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE tidak didukung dengan cURL < 7.44.0" @@ -21160,6 +21357,14 @@ msgid "Could not set SSL backend to '%s': already set" msgstr "Tidak dapat menyetel tulang punggung SSL ke '%s': sudah disetel" #: http.c +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "menolak membaca kuki dari http.cookiefile '-'" + +#: http.c +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "mengabaikan http.savecookies karena http.cookiefile kosong" + +#: http.c #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21367,10 +21572,10 @@ msgstr "Gagal menggabungkan submodul %s (tidak ada dasar penggabungan)" msgid "Failed to merge submodule %s (commits not present)" msgstr "Gagal menggabungkan submodul %s (komit tidak ada)" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "Gagal menggabungkan submodul %s (repositori rusak)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "kesalahan: gagal menggabungkan submodul %s (repositori rusak)" #: merge-ort.c merge-recursive.c #, c-format @@ -21406,14 +21611,15 @@ msgstr "" "mungkin:\n" "%s" -#: merge-ort.c merge-recursive.c -msgid "failed to execute internal merge" -msgstr "gagal menjalankan penggabungan internal" +#: merge-ort.c +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "kesalahan: gagal menjalankan penggabungan internal untuk %s" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "unable to add %s to database" -msgstr "tidak dapat menambahkan %s ke basis data" +msgid "error: unable to add %s to database" +msgstr "kesalahan: tidak dapat menambahkan %s ke basis data" #: merge-ort.c merge-recursive.c #, c-format @@ -21520,15 +21726,15 @@ msgstr "" "KONFLIK (penamaan ulang/penghapusan): %s dinamai ulang ke %s di %s, tetapi " "dihapus di %s." -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "cannot read object %s" -msgstr "tidak dapat membaca objek %s" +msgid "error: cannot read object %s" +msgstr "kesalahan: tidak dapat membaca objek %s" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "object %s is not a blob" -msgstr "objek %s bukanlah sebuah blob" +msgid "error: object %s is not a blob" +msgstr "kesalahan: objek %s bukanlah suatu blob" #: merge-ort.c #, c-format @@ -21689,6 +21895,11 @@ msgstr "tidak tahu apa yang dilakukan dengan %06o %s '%s'" #: merge-recursive.c #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "Gagal menggabungkan submodul %s (repositori rusak)" + +#: merge-recursive.c +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Memaju-cepat submodul %s ke komit berikut:" @@ -21735,6 +21946,15 @@ msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Gagal menggabungkan submodul %s (banyak penggabungan ditemukan)" #: merge-recursive.c +msgid "failed to execute internal merge" +msgstr "gagal menjalankan penggabungan internal" + +#: merge-recursive.c +#, c-format +msgid "unable to add %s to database" +msgstr "tidak dapat menambahkan %s ke basis data" + +#: merge-recursive.c #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -21857,6 +22077,16 @@ msgstr "" "%s. Penamaan ulang %s->%s di %s" #: merge-recursive.c +#, c-format +msgid "cannot read object %s" +msgstr "tidak dapat membaca objek %s" + +#: merge-recursive.c +#, c-format +msgid "object %s is not a blob" +msgstr "objek %s bukanlah sebuah blob" + +#: merge-recursive.c msgid "modify" msgstr "ubah" @@ -21962,10 +22192,6 @@ msgid "malformed line: %s" msgstr "baris jelek '%s'." #: midx-write.c -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok" - -#: midx-write.c msgid "could not load pack" msgstr "tidak dapat memuat pak" @@ -21975,6 +22201,10 @@ msgid "could not open index for %s" msgstr "tidak dapat membuka indeks untuk %s" #: midx-write.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok" + +#: midx-write.c msgid "Adding packfiles to multi-pack-index" msgstr "Menambahkan berkas pak ke indeks multipak" @@ -22723,6 +22953,20 @@ msgid "hash mismatch %s" msgstr "hash tidak cocok %s" #: pack-bitmap-write.c +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "entri duplikat ketika menulis indeks bitmap: %s" + +#: pack-bitmap-write.c +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "mencoba menyimpan komit yang tidak dipilih: '%s'" + +#: pack-bitmap-write.c +msgid "too many pseudo-merges" +msgstr "terlalu banyak penggabungan semu" + +#: pack-bitmap-write.c msgid "trying to write commit not in index" msgstr "mencoba menulis komit yang bukan di indeks" @@ -22753,6 +22997,23 @@ msgstr "" "berkas indeks bitmap rusak (terlalu pendek untuk masuk tabel pencarian)" #: pack-bitmap.c +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"berkas indeks bitmap rusak (terlalu pendek untuk masuk kepala tabel " +"penggabungan semu)" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" +"berkas indeks bitmap rusak (terlalu pendek untuk masuk tabel penggabungan " +"semu)" + +#: pack-bitmap.c +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "berkas indeks bitmap rusak (tabel penggabungan semu terlalu pendek)" + +#: pack-bitmap.c #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "entri duplikat di indeks bitmap: '%s'" @@ -22868,6 +23129,11 @@ msgstr "ketidaksesuaian di dalam hasil bitmap" #: pack-bitmap.c #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "indeks penggabungan semu di luar jangkauan (%<PRIu32> >= %<PRIuMAX>)" + +#: pack-bitmap.c +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "tidak dapat menemukan %s di dalam pak '%s' pada offset %<PRIuMAX>" @@ -23325,6 +23591,10 @@ msgid "unable to parse --pretty format" msgstr "tidak dapat menguraikan format --pretty" #: promisor-remote.c +msgid "lazy fetching disabled; some objects may not be available" +msgstr "pengambilan malas dimatikan; beberapa objek mungkin tidak tersedia" + +#: promisor-remote.c msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: tidak dapat menggarpu subproses pengambilan" @@ -23355,6 +23625,83 @@ msgstr "object-info: bilasan diharapkan setelah argumen" msgid "Removing duplicate objects" msgstr "Menghapus objek duplikat" +#: pseudo-merge.c +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "gagal memuat regex penggabungan semu untuk %s: '%s'" + +#: pseudo-merge.c +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s harus non-negatif, menggunakan yang asali" + +#: pseudo-merge.c +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s harus di antara 0 atau 1, menggunakan yang asali" + +#: pseudo-merge.c +#, c-format +msgid "%s must be positive, using default" +msgstr "%s harus positif, menggunakan yang asali" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "grup penggabungan semu '%s' kehilangan pola yang diperlukan" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "" +"grup penggabungan semu '%s' punya ambang batas tidak stabil sebelum yang " +"stabil" + +#: pseudo-merge.c +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"regex penggabungan semu dari konfigurasi punya terlalu banyak grup tangkap " +"(max=%<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"pembacaan penggabungan semu yang diperluas di luar batas (%<PRIuMAX> >= " +"%<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"entri penggabungan semu yang diperluas terlalu pendek (%<PRIuMAX> >= " +"%<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "" +"tidak dapat menemukan penggabungan semu untuk %s pada offset %<PRIuMAX>" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "" +"pencarian penggabungan semu yang diperluas di luar batas (%<PRIu32> >= " +"%<PRIu32>)" + +#: pseudo-merge.c +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "pembacaan di luar batas: (%<PRIuMAX> >= %<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "tidak dapat membaca tabel penggabungan semu untuk komit %s" + #: range-diff.c msgid "could not start `log`" msgstr "tidak dapat memulai `log`" @@ -24081,12 +24428,21 @@ msgid "log for %s is empty" msgstr "log untuk %s kosong" #: refs.c +msgid "refusing to force and skip creation of reflog" +msgstr "menolak memaksa dan melewatkan pembuatan reflog" + +#: refs.c #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "menolak memperbarui referensi dengan nama jelek '%s'" #: refs.c #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "menolak memperbarui referensi semu '%s'" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref gagal untuk referensi '%s': %s" @@ -24123,6 +24479,29 @@ msgstr "tidak dapat menghapus referensi %s: %s" msgid "could not delete references: %s" msgstr "tidak dapat menghapus referensi: %s" +#: refs.c +#, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "Selesai uji coba migrasi referensi, hasilnya bisa dilihat di '%s'\n" + +#: refs.c +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "tidak dapat menamai ulang direktori migrasi sementara '%s'" + +#: refs.c +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "referensi termigrasi dapat ditemukan pada '%s'" + +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"tidak dapat mengunci referensi '%s': diharapkan referensi simbolik dengan " +"target '%s': tetapi bukan referensi reguler" + #: refs/reftable-backend.c #, c-format msgid "refname is dangerous: %s" @@ -25545,6 +25924,55 @@ msgstr "" #: sequencer.c #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' tidak menerima komit penggabungan" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick' tidak mengambil komit penggabungan. Apabila Anda\n" +"ingin memainkan ulang penggabungan, gunakan 'merge -C'\n" +"pada komit." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword' tidak mengambil komit penggabungan. Apabila Anda\n" +"ingin memainkan ulang penggabungan dan menulis ulang pesan\n" +"komit, gunakan 'merge -c' pada komit" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +#: sequencer.c +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'edit' tidak mengambil komit penggabungan. Apabila Anda\n" +"ingin memainkan ulang komit, gunakan 'merge -C' pada komit,\n" +"lalu 'break' untuk memberikan Anda kembali kendali agar\n" +"Anda dapat menjalankan 'git commit --amend && git rebase --continue'." + +#: sequencer.c +msgid "cannot squash merge commit into another commit" +msgstr "tidak dapat melumatkan komit penggabungan ke dalam komit lainnya" + +#: sequencer.c +#, c-format msgid "invalid command '%.*s'" msgstr "perintah tidak valid '%.*s'" @@ -25695,9 +26123,8 @@ msgid "cannot read HEAD" msgstr "tidak dapat membaca HEAD" #: sequencer.c -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "tidak dapat menyalin '%s' ke '%s'" +msgid "could not write commit message file" +msgstr "tidak dapat menulis berkas pesan komit" #: sequencer.c #, c-format @@ -26180,6 +26607,19 @@ msgid "failed to stat '%*s%s%s'" msgstr "gagal men-stat '%*s%s%s'" #: setup.c +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"perizinan meragukan terdeteksi di dalam repositori pada '%s'\n" +"%sUntuk menambahkan pengecualian untuk direktori ini, panggil:\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#: setup.c msgid "Unable to read current working directory" msgstr "tidak dapat membaca direktori kerja saat ini" @@ -26205,19 +26645,6 @@ msgstr "" #: setup.c #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"perizinan meragukan terdeteksi di dalam repositori pada '%s'\n" -"%sUntuk menambahkan pengecualian untuk direktori ini, panggil:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#: setup.c -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "" "tidak dapat menggunakan repositori bare '%s' (safe.bareRepository yaitu '%s')" @@ -26591,6 +27018,17 @@ msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'" #: submodule.c #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"'%.*s' diharapkan di jalur submodul '%s' yang tidak menjadi tautan simbolik" + +#: submodule.c +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "jalur submodul '%s' diharapkan yang tidak menjadi tautan simbolik" + +#: submodule.c +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -26637,11 +27075,6 @@ msgid "no remote configured to get bundle URIs from" msgstr "tidak ada remote yang dikonfigurasi untuk mendapatkan URI bundel" #: t/helper/test-bundle-uri.c -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "remote '%s' tidak punya URL terkonfigurasi" - -#: t/helper/test-bundle-uri.c msgid "could not get the bundle-uri list" msgstr "tidak dapat mendapatkan daftar bundle-uri" @@ -28440,29 +28873,29 @@ msgstr "Gagal mengirim %s\n" #: git-send-email.perl #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Terkirim-kering %s\n" +msgid "Dry-Sent %s" +msgstr "Uji-coba-Terkirim %s" #: git-send-email.perl #, perl-format -msgid "Sent %s\n" -msgstr "Terkirim %s\n" +msgid "Sent %s" +msgstr "Terkirim %s" #: git-send-email.perl -msgid "Dry-OK. Log says:\n" -msgstr "OK-kering. Log berkata:\n" +msgid "Dry-OK. Log says:" +msgstr "Uji-coba-OK. Log berkata:" #: git-send-email.perl -msgid "OK. Log says:\n" -msgstr "OK. Log berkata:\n" +msgid "OK. Log says:" +msgstr "OK. Log berkata:" #: git-send-email.perl msgid "Result: " msgstr "Hasil: " #: git-send-email.perl -msgid "Result: OK\n" -msgstr "Hasil: OK\n" +msgid "Result: OK" +msgstr "Hasil: OK" #: git-send-email.perl #, perl-format @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.45.0\n" +"Project-Id-Version: git 2.46.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-27 15:19+0100\n" -"PO-Revision-Date: 2024-04-27 15:20+0100\n" +"POT-Creation-Date: 2024-07-20 21:56+0100\n" +"PO-Revision-Date: 2024-07-21 14:53+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -556,6 +556,10 @@ msgstr "" "p - visa aktuellt stycke\n" "? - visa hjälp\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Förväntade endast en bokstav, fick â€%sâ€" + msgid "No previous hunk" msgstr "Inget föregÃ¥ende stycke" @@ -604,9 +608,19 @@ msgstr "Dela i %d stycken." msgid "Sorry, cannot edit this hunk" msgstr "Beklagar, kan inte redigera stycket" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Okänt kommando â€%s†(använd â€?†för hjälp)" + msgid "'git apply' failed" msgstr "â€git apply†misslyckades" +msgid "No changes." +msgstr "Inga ändringar." + +msgid "Only binary files changed." +msgstr "Endast binära filer ändrade." + #, c-format msgid "" "\n" @@ -1461,6 +1475,9 @@ msgstr "ignorerar allt för stor gitattributes-fil â€%sâ€" msgid "ignoring overly large gitattributes blob '%s'" msgstr "ignorerar allt för stor gitattributes-objekt â€%sâ€" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "kan inte använda --attr-source eller GIT_ATTR_SOURCE utan arkiv" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "felaktig --attr-source eller GIT_ATTR_SOURCE" @@ -1778,13 +1795,6 @@ msgstr "kan inte utföra chmod %cx â€%sâ€" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"inställningen add.interactive.useBuiltin har tagits bort!\n" -"Se dess post i â€git help config†för detaljer." - msgid "could not read the index" msgstr "kunde inte läsa indexet" @@ -2219,6 +2229,9 @@ msgstr "avbryt patchningen men behÃ¥ll HEAD där det är" msgid "show the patch being applied" msgstr "visa patchen som tillämpas" +msgid "try to apply current patch again" +msgstr "försök applicera aktuell patch pÃ¥ nytt" + msgid "record the empty patch as an empty commit" msgstr "lagra den tomma patchen som en tom incheckning" @@ -2274,9 +2287,6 @@ msgstr "git apply [<flaggor>] [<patch>...]" msgid "could not redirect output" msgstr "kunde inte omdirigera utdata" -msgid "git archive: Remote with no URL" -msgstr "git archive: Fjärr utan URL" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: förväntade ACK/NAK, fick flush-paket" @@ -3169,6 +3179,9 @@ msgstr "Behöver ett arkiv för att skapa en bunt." msgid "do not show bundle details" msgstr "visa inte buntdetaljer" +msgid "need a repository to verify a bundle" +msgstr "behöver ett arkiv för att bekräfta en bunt." + #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" @@ -4174,6 +4187,14 @@ msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken â€%sâ€" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "hÃ¥rd länk kan inte kontrolleras vid â€%sâ€" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "hÃ¥rd länk skiljer sig frÃ¥n källan vid â€%sâ€" + +#, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken â€%sâ€" @@ -4996,15 +5017,50 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "â€git restore --staged :/†för att Ã¥terställa." -msgid "git config [<options>]" -msgstr "git config [<flaggor>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<filflagga>] [<visningsflagga>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "okänt argument för --type, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<filflagga>] [<visningsflagga>] [--includes] [--all] [--" +"regexp=<reguttr>] [--value=<värde>] [--fixed-value] [--default=<förval>] " +"<namn>" -msgid "only one type at a time" -msgstr "endast en typ Ã¥t gÃ¥ngen" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<filflagga>] [--type=<typ>] [--all] [--value=<värde>] [--" +"fixed-value] <namn> <värde>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<filflagga>] [--all] [--value=<värde>] [--fixed-value] " +"<namn> <värde>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<filflagga>] <gammalt-namn> <nytt-namn>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<filflagga>] <namn>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<filflagga>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<filflagga>] --get-colorbool <namn> [<stdout-är-tty>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<filflagga>] [--type=<typ>] [--comment=<meddelande>] [--all] " +"[--value=<värde>] [--fixed-value] <namn> <värde>" msgid "Config file location" msgstr "Konfigurationsfilens plats" @@ -5030,54 +5086,6 @@ msgstr "blob-id" msgid "read config from given blob object" msgstr "läs konfiguration frÃ¥n givet blob-objekt" -msgid "Action" -msgstr "Ã…tgärd" - -msgid "get value: name [value-pattern]" -msgstr "hämta värde: namn [värde-mönster]" - -msgid "get all values: key [value-pattern]" -msgstr "hämta alla värden: nyckel [värde-mönster]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "hämta värden för reguttr: namn-reguttr [värde-mönster]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "hämta värde specifikt URL:en: sektion[.var] URL" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "ersätt alla motsvarande variabler: namn värde [värde-mönster]" - -msgid "add a new variable: name value" -msgstr "lägg till en ny variabel: namn värde" - -msgid "remove a variable: name [value-pattern]" -msgstr "ta bort en variabel: namn [värde-mönster]" - -msgid "remove all matches: name [value-pattern]" -msgstr "ta bort alla träffar: namn [värde-mönster]" - -msgid "rename section: old-name new-name" -msgstr "byt namn pÃ¥ sektion: gammalt-namn nytt-namn" - -msgid "remove a section: name" -msgstr "ta bort en sektion: namn" - -msgid "list all" -msgstr "visa alla" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "använd stränglikhet vid när värden jämförs med â€värde-mönsterâ€" - -msgid "open an editor" -msgstr "öppna textredigeringsprogram" - -msgid "find the color configured: slot [default]" -msgstr "hitta den inställda färgen: slot [default]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "hitta färginställningen: slot [stdout-is-tty]" - msgid "Type" msgstr "Typ" @@ -5105,8 +5113,8 @@ msgstr "värdet är en sökväg (fil- eller katalognamn)" msgid "value is an expiry date" msgstr "värdet är ett utgÃ¥ngsdatum" -msgid "Other" -msgstr "Andra" +msgid "Display options" +msgstr "Visningsflaggor" msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" @@ -5114,9 +5122,6 @@ msgstr "terminera värden med NUL-byte" msgid "show variable names only" msgstr "visa endast variabelnamn" -msgid "respect include directives on lookup" -msgstr "respektera inkluderingsdirektiv vid uppslag" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" @@ -5125,14 +5130,15 @@ msgstr "" "visa omfÃ¥ng för konfiguration (arbetskatalog, lokalt, globalt, system, " "kommando)" -msgid "value" -msgstr "värde" +msgid "show config keys in addition to their values" +msgstr "visa konfigurationsnycklar tillsammans med deras värden" -msgid "with --get, use default value when missing entry" -msgstr "med --get, använd standardvärde vid saknad post" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "okänt argument för --type, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "människoläsbar kommentarssträng (# läggs in först efter behov)" +msgid "only one type at a time" +msgstr "endast en typ Ã¥t gÃ¥ngen" #, c-format msgid "wrong number of arguments, should be %d" @@ -5208,46 +5214,72 @@ msgstr "" "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" "â€KONFIGURATIONSFIL†i â€git help worktree†för detaljer" -msgid "--get-color and variable type are incoherent" -msgstr "--get-color och variabeltyp stämmer inte överens" +msgid "Other" +msgstr "Andra" -msgid "only one action at a time" -msgstr "endast en Ã¥tgärd Ã¥t gÃ¥ngen" +msgid "respect include directives on lookup" +msgstr "respektera inkluderingsdirektiv vid uppslag" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only gäller bara för --list eller --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "kan inte läsa konfigurationsfilen â€%sâ€" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"--show-origin gäller bara för --get, --get-all, --get-regexp och --list" +msgid "error processing config file(s)" +msgstr "fel vid hantering av konfigurationsfil(er)" -msgid "--default is only applicable to --get" -msgstr "--default gäller bara för --get" +msgid "Filter options" +msgstr "Filterflaggor" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment gäller bara för â€getâ€/â€setâ€/â€replaceâ€-operationerna" +msgid "return all values for multi-valued config options" +msgstr "returnera alla värden för konfigurationsflaggor med flera värden" + +msgid "interpret the name as a regular expression" +msgstr "tolka namnet som reguljärt uttryck" + +msgid "show config with values matching the pattern" +msgstr "via konfiguration med värden som motsvarar mönster" + +msgid "use string equality when comparing values to value pattern" +msgstr "använd stränglikhet vid när värden jämförs med värde-mönster" + +msgid "URL" +msgstr "URL" + +msgid "show config matching the given URL" +msgstr "visa konfiguration som motsvarar given URL" + +msgid "value" +msgstr "värde" + +msgid "use default value when missing entry" +msgstr "använd standardvärde vid saknad post" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value gäller endast med â€värde-mönsterâ€" -#, c-format -msgid "unable to read config file '%s'" -msgstr "kan inte läsa konfigurationsfilen â€%sâ€" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= kan inte användas med --all eller --url=" -msgid "error processing config file(s)" -msgstr "fel vid hantering av konfigurationsfil(er)" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= kan inte användas med --all, --regexp eller --value" -msgid "editing stdin is not supported" -msgstr "redigering av standard in stöds ej" +msgid "Filter" +msgstr "Filter" -msgid "editing blobs is not supported" -msgstr "redigering av blobbar stöds ej" +msgid "replace multi-valued config option with new value" +msgstr "ersätt konfigurationsflagga med flera värden med nytt värde" -#, c-format -msgid "cannot create configuration file %s" -msgstr "kan inte skapa konfigurationsfilen â€%sâ€" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "människoläsbar kommentarssträng (# läggs in först efter behov)" + +msgid "add a new line without altering any existing values" +msgstr "lägg till ny rad utan att ändra befintliga värden" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value gäller endast med --value=<mönster>" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append kan inte användas med --value=<mönster>" #, c-format msgid "" @@ -5261,6 +5293,85 @@ msgstr "" msgid "no such section: %s" msgstr "ingen sÃ¥dan sektion: %s" +msgid "editing stdin is not supported" +msgstr "redigering av standard in stöds ej" + +msgid "editing blobs is not supported" +msgstr "redigering av blobbar stöds ej" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "kan inte skapa konfigurationsfilen â€%sâ€" + +msgid "Action" +msgstr "Ã…tgärd" + +msgid "get value: name [<value-pattern>]" +msgstr "hämta värde: namn <värde-mönster>" + +msgid "get all values: key [<value-pattern>]" +msgstr "hämta alla värden: nyckel <värde-mönster>" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "hämta värden för reguttr: namn-reguttr <värde-mönster>" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "hämta värde specifikt URL:en: sektion[.var] URL" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "ersätt alla motsvarande variabler: namn värde <värde-mönster>" + +msgid "add a new variable: name value" +msgstr "lägg till en ny variabel: namn värde" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "ta bort en variabel: namn <värde-mönster>" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "ta bort alla träffar: namn <värde-mönster>" + +msgid "rename section: old-name new-name" +msgstr "byt namn pÃ¥ sektion: gammalt-namn nytt-namn" + +msgid "remove a section: name" +msgstr "ta bort en sektion: namn" + +msgid "list all" +msgstr "visa alla" + +msgid "open an editor" +msgstr "öppna textredigeringsprogram" + +msgid "find the color configured: slot [<default>]" +msgstr "hitta den inställda färgen: lucka <förval>" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "hitta färginställningen: lucka <stdout-är-tty>" + +msgid "with --get, use default value when missing entry" +msgstr "med --get, använd standardvärde vid saknad post" + +msgid "--get-color and variable type are incoherent" +msgstr "--get-color och variabeltyp stämmer inte överens" + +msgid "no action specified" +msgstr "ingen handling angavs" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only gäller bara för --list eller --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin gäller bara för --get, --get-all, --get-regexp och --list" + +msgid "--default is only applicable to --get" +msgstr "--default gäller bara för --get" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment gäller bara för â€getâ€/â€setâ€/â€replaceâ€-operationerna" + msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -6079,6 +6190,9 @@ msgstr "konfig" msgid "config key storing a list of repository paths" msgstr "konfigurationsnyckel som innehÃ¥ller en lista över arkivsökvägar" +msgid "keep going even if command fails in a repository" +msgstr "fortsätt även om kommandot misslyckas i ett arkiv" + msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" @@ -7531,8 +7645,11 @@ msgstr "markera serien som N:te försök" msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "använd [RFC PATCH] istället för [PATCH]" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "lägg till <rfc> (förval â€RFCâ€) före â€PATCHâ€" msgid "cover-from-description-mode" msgstr "cover-from-description-läge" @@ -7793,11 +7910,11 @@ msgstr "" "deduplicate, --eol" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<nyckel>]\n" " [--symref] [<arkiv> [<mönster>...]]" @@ -7813,8 +7930,11 @@ msgstr "sökväg till git-upload-pack pÃ¥ fjärren" msgid "limit to tags" msgstr "begränsa till taggar" -msgid "limit to heads" -msgstr "begränsa till huvuden" +msgid "limit to branches" +msgstr "begränsa till grenar" + +msgid "deprecated synonym for --branches" +msgstr "förÃ¥ldrad synonym till --branches" msgid "do not show peeled tags" msgstr "visa inte avskalade taggar" @@ -10423,6 +10543,22 @@ msgstr "ingen referenslogg att ta bort angavs" msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<format> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "ange referensformatet att konvertera till" + +msgid "perform a non-destructive dry-run" +msgstr "utför ett icke-destruktiv testkörning" + +msgid "missing --ref-format=<format>" +msgstr "saknad --ref-format=<format>" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "arkivet använder redan â€%sâ€-format" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -10703,9 +10839,6 @@ msgstr "* fjärr %s" msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -msgid "(no URL)" -msgstr "(ingen URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -10714,6 +10847,9 @@ msgstr "(ingen URL)" msgid " Push URL: %s" msgstr " Sänd-URL: %s" +msgid "(no URL)" +msgstr "(ingen URL)" + #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" @@ -10819,10 +10955,6 @@ msgstr "frÃ¥ga sänd-URL:er istället för hämta-URL:er" msgid "return all URLs" msgstr "returnera alla URL:er" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "ingen URL:er angivna för fjärren â€%sâ€" - msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" @@ -11818,12 +11950,12 @@ msgstr "okänd hashningsalgoritm" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<mönster>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<mönster>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -11846,11 +11978,11 @@ msgstr "referensen existerar inte" msgid "failed to look up reference" msgstr "misslyckades slÃ¥ upp referensen" -msgid "only show tags (can be combined with heads)" -msgstr "visa endast taggar (kan kombineras med huvuden)" +msgid "only show tags (can be combined with branches)" +msgstr "visa endast taggar (kan kombineras med grenar)" -msgid "only show heads (can be combined with tags)" -msgstr "visa endast huvuden (kan kombineras med taggar)" +msgid "only show branches (can be combined with tags)" +msgstr "visa endast grenar (kan kombineras med taggar)" msgid "check for reference existence without resolving" msgstr "kontrollerar att referensen existerar utan att slÃ¥ upp dem" @@ -12471,14 +12603,14 @@ msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "vägrar skapa/använda â€%s†i en annan undermoduls gitkatalog" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "misslyckades klona â€%s†till undermodulsökvägen â€%sâ€" - -#, c-format msgid "directory not empty: '%s'" msgstr "katalogen inte tom: â€%sâ€" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "misslyckades klona â€%s†till undermodulsökvägen â€%sâ€" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte fÃ¥ tag i undermodulkatalog för â€%sâ€" @@ -12835,9 +12967,11 @@ msgstr "skäl till uppdateringen" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] [-e]\n" +" [(--trailer <symbol>[(=|:)<värde>])...]\n" " <taggnamn> [<incheckning> | <objekt>]" msgid "git tag -d <tagname>..." @@ -13682,9 +13816,6 @@ msgstr "okänt huvud: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -msgid "need a repository to verify a bundle" -msgstr "behöver ett arkiv för att bekräfta en bunt." - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14082,6 +14213,9 @@ msgstr "Ta emot det som sänds till arkivet" msgid "Manage reflog information" msgstr "Hantera referenslogg-information" +msgid "Low-level access to refs" +msgstr "LÃ¥gnivååtkomst till referenser" + msgid "Manage set of tracked repositories" msgstr "Hantera uppsättningen spÃ¥rade arkiv" @@ -14387,6 +14521,14 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" "incheckningsgrafens nödvändiga incheckningsdatastycke saknas eller är trasigt" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"inaktivera Bloom-filter för incheckningsgraflager â€%s†pÃ¥ grund av " +"inkompatibla inställningar" + msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" @@ -14510,6 +14652,14 @@ msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men â€core.commitGraph†är inaktiverad" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph." +"changedPathsVersion' (%d) is not supported" +msgstr "" +"försöker skriva en incheckningsgraf, men â€commitGraph." +"changedPathsVersion†(%d) stöds inte" + msgid "too many commits to write graph" msgstr "för mÃ¥nga incheckningar för att skriva graf" @@ -16348,18 +16498,23 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h |--help] [-C <sökväg>] [-c <namn>=<värde>]\n" " [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-" "path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n" -" [--config-env=<namn>=<miljövar>] <kommando> [<flaggor>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-" +"dir=<sökväg>]\n" +" [--work-tree=<sökväg>] [--namespace=<namn>] [--config-" +"env=<namn>=<miljövar>]\n" +" <kommando> [<flaggor>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16695,14 +16850,14 @@ msgstr "" "Kroken â€%s†ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med â€git config advice.ignoredHook falseâ€." +msgid "not a git repository" +msgstr "inte ett git-arkiv" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" "argumentet till --packfile mÃ¥ste vara ett giltigt hashvärde (fick '%s')" -msgid "not a git repository" -msgstr "inte ett git-arkiv" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "http.postBuffer har negativt värde; använder förvalet %d" @@ -16713,6 +16868,9 @@ msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "FastnÃ¥lning av öppen nyckel stöds inte av cURL < 7.39.0" +msgid "Unknown value for http.proactiveauth" +msgstr "Okänt värde för http.proactiveauth" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" @@ -16728,6 +16886,12 @@ msgstr "Kan inte sätta SSL-bakända till â€%sâ€: cURL byggdes utan SSL-bakän msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till â€%sâ€: redan valt" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "vägrar läsa kakor frÃ¥n filen â€-†angiven i http.cookiefile" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "ignorerar http.savecookies för tom http.cookiefile" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -16902,8 +17066,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slÃ¥ ihop undermodulen %s (incheckningar saknas)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "Misslyckades slÃ¥ ihop undermodulen %s (arkivet är trasigt)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "fel: misslyckades slÃ¥ ihop undermodulen %s (arkivet är trasigt)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -16933,12 +17097,13 @@ msgstr "" "finns:\n" "%s" -msgid "failed to execute internal merge" -msgstr "misslyckades exekvera intern sammanslagning" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "fel: misslyckades exekvera intern sammanslagning för %s" #, c-format -msgid "unable to add %s to database" -msgstr "kan inte lägga till %s till databasen" +msgid "error: unable to add %s to database" +msgstr "fel: kan inte lägga till %s till databasen" #, c-format msgid "Auto-merging %s" @@ -17031,12 +17196,12 @@ msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." #, c-format -msgid "cannot read object %s" -msgstr "kan inte läsa objektet %s" +msgid "error: cannot read object %s" +msgstr "fel: kan inte läsa objektet %s" #, c-format -msgid "object %s is not a blob" -msgstr "objektet %s är inte en blob" +msgid "error: object %s is not a blob" +msgstr "fel: objektet %s är inte en blob" #, c-format msgid "" @@ -17176,6 +17341,10 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s â€%s†ska hanteras" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "Misslyckades slÃ¥ ihop undermodulen %s (arkivet är trasigt)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" @@ -17217,6 +17386,13 @@ msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slÃ¥ ihop undermodulen %s (flera sammanslagningar hittades)" +msgid "failed to execute internal merge" +msgstr "misslyckades exekvera intern sammanslagning" + +#, c-format +msgid "unable to add %s to database" +msgstr "kan inte lägga till %s till databasen" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospÃ¥rad fil vid %s; skriver till %s istället." @@ -17312,6 +17488,14 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s→%s i %s. Namnbytt katalog " "%s→%s i %s" +#, c-format +msgid "cannot read object %s" +msgstr "kan inte läsa objektet %s" + +#, c-format +msgid "object %s is not a blob" +msgstr "objektet %s är inte en blob" + msgid "modify" msgstr "ändra" @@ -17395,9 +17579,6 @@ msgstr "kunde inte tolka rad: %s" msgid "malformed line: %s" msgstr "felaktig rad: %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" - msgid "could not load pack" msgstr "kunde inte läsa paket{" @@ -17405,6 +17586,9 @@ msgstr "kunde inte läsa paket{" msgid "could not open index for %s" msgstr "kunde inte öppna indexet för %s" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" + msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" @@ -18011,6 +18195,17 @@ msgstr "kan inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "duplicerad post när bitkarteindex skulle skrivas: %s" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "försökta lagra icke-vald incheckning: â€%sâ€" + +msgid "too many pseudo-merges" +msgstr "för mÃ¥nga pseudo-sammanslagningar" + msgid "trying to write commit not in index" msgstr "försöker skriva incheckning som inte finns i indexet" @@ -18033,6 +18228,20 @@ msgstr "trasigt bitkarteindex (för kort för att fÃ¥ plats för hash-cache)" msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "trasigt bitkarteindex (för kort för att fÃ¥ plats för uppslagstabell)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"trasig bitkarteindexfil (för kort för att fÃ¥ plats för pseudo-" +"sammanslagningsatbellhuvudet)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" +"trasig bitkarteindexfil (för kort för att fÃ¥ plats för pseudo-" +"sammanslagningstabell)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "trasig bitkarteindexfil, pseudosammanslagningstabellen är för kort" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "duplicerad post i bitkarteindex: â€%sâ€" @@ -18123,6 +18332,10 @@ msgid "mismatch in bitmap results" msgstr "bitkarteresultat stämmer inte överens" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "pseudosammanslaningsindex utenför intervallet (%<PRIu32> ≥ %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "kunde inte hitta â€%s†i paketet â€%s†pÃ¥ offset %<PRIuMAX>" @@ -18483,6 +18696,10 @@ msgstr "kan inte skapa trÃ¥dad lstat: %s" msgid "unable to parse --pretty format" msgstr "kan inte tolka format för --pretty" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "" +"fördröjd hämtning inaktiverad; nÃ¥gra objekt kanske inte är tillgängliga" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: kan inte grena (fork) av underprocessen för fetch" @@ -18507,6 +18724,71 @@ msgstr "object-info: förväntade â€flush†efter argument" msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "" +"misslyckades läsa reguljärt uttryck för pseudosammanslagning för â€%sâ€: %s" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s mÃ¥ste vara icke-negativt, använder förval" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s mÃ¥ste vara mellan 0 och 1, använder förval" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s mÃ¥ste vara positivt, använder förval" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "pseudosammanslagningsgruppen â€%s†saknar nödvändigt mönster" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "" +"pseudosammanslagningsgruppen â€%s†har instabila tröskelvärden innan de " +"stabila" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"reguljärt uttryck för pseudosammanslagning har för mÃ¥nga fÃ¥ngstgrupper " +"(max=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"läsning utanför intervallet för utökad pseudosammanslagning (%<PRIuMAX> ≥ " +"%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"posten för utökad pseudosammanslagning är för kort (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "" +"kunde inte hitta pseudosammanslagning för incheckningen %s pÃ¥ offset " +"%<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "" +"uppslagning utanför intervallet för utökad pseudosammanslagning (%<PRIu32> ≥ " +"%<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "läsning utanför intervallet: (%<PRIuMAX> ≥ %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "kunde inte läsa utökad pseudosammanslagningstabell för incheckning %s" + msgid "could not start `log`" msgstr "kunde inte starta â€logâ€" @@ -19108,11 +19390,18 @@ msgstr "loggen för referensen %s slutade oväntat pÃ¥ %s" msgid "log for %s is empty" msgstr "loggen för %s är tom" +msgid "refusing to force and skip creation of reflog" +msgstr "vägrar att tvinga och hoppa över skapande av reflogg" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn â€%sâ€" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "vägrar uppdatera pseudoreferensen â€%sâ€" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen â€%sâ€: %s" @@ -19143,6 +19432,25 @@ msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "Avslutade testkörning av referensmigrering, resultatet hittas i â€%sâ€\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "kunde ta bort temporär migreringskatalog â€%sâ€" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "migrerade referenser hittas vid â€%sâ€" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"kan inte läsa referensen â€%sâ€: förväntade symbolisk referens med mÃ¥let â€%sâ€: " +"men är en vanlig referens" + +#, c-format msgid "refname is dangerous: %s" msgstr "refnamnet är farligt: %s" @@ -20289,6 +20597,53 @@ msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "update-ref kräver ett fullständigt referensnamn, t.ex refs/heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "â€%s†godtar inte sammanslagningsincheckningar" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"â€pick†tar inte en sammanslagningsincheckning. Om du\n" +"ville spela upp sammanslagningen pÃ¥ nytt använder du\n" +"â€merge -C†pÃ¥ incheckningen." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"â€reword†tar inte en sammanslagningsincheckning. Om du\n" +"ville spela upp sammanslagningen pÃ¥ nytt och ändra texten\n" +"i incheckningsmeddelandet använder du â€merge -C†pÃ¥\n" +"incheckningen" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"â€edit†tar inte en sammanslagningsincheckning. Om du\n" +"ville spela upp sammanslagningen pÃ¥ nytt använder du\n" +"â€merge -C†pÃ¥ incheckningen och sedan â€break†för att\n" +"lämna kontrollen tillbaka till dig sÃ¥ att du kan\n" +"använda â€git commit --amend && git rebase --continueâ€." + +msgid "cannot squash merge commit into another commit" +msgstr "" +"kan inte slÃ¥ ihop en sammanslagningsincheckning med en annan incheckning" + +#, c-format msgid "invalid command '%.*s'" msgstr "ogiltigt kommando â€%.*sâ€" @@ -20406,9 +20761,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "kan inte kopiera in â€%s†till â€%sâ€" +msgid "could not write commit message file" +msgstr "kunde inte skriva fil för incheckningsmeddelande" #, c-format msgid "" @@ -20807,6 +21161,18 @@ msgstr "kan inte gÃ¥ tillbaka till arbetskatalogen (cwd)" msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status pÃ¥ â€%*ss%s%sâ€" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"upptäckte tveksamt ägarskap i arkivet i â€%sâ€\n" +"%sFör att lägga till ett undantag för denna katalog, kör:\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" @@ -20828,18 +21194,6 @@ msgstr "" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"upptäckte tveksamt ägarskap i arkivet i â€%sâ€\n" -"%sFör att lägga till ett undantag för denna katalog, kör:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "kan inte använda naket arkiv â€%s†(safe.bareRepository är â€%sâ€)" @@ -21141,6 +21495,16 @@ msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen â€%s†är inuti gitkatalogen â€%.*sâ€" #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"förväntade att â€%.*s†i undermodulsökvägen â€%s†inte ska vara en symbolisk " +"länk" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "förväntade att undermodulsökvägen â€%s†inte ska vara en symbolisk länk" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -21179,10 +21543,6 @@ msgstr "misslyckades ta status (lstat) pÃ¥ â€%sâ€" msgid "no remote configured to get bundle URIs from" msgstr "ingen fjärr att hämta bunt-URI:er frÃ¥n inställd" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "fjärren â€%s†har ingen URL konfigurerad" - msgid "could not get the bundle-uri list" msgstr "kunde inte hämta bundle-uri-listan" @@ -22641,24 +23001,24 @@ msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Test-Sände %s\n" +msgid "Dry-Sent %s" +msgstr "Test-Sände %s" #, perl-format -msgid "Sent %s\n" -msgstr "Sände %s\n" +msgid "Sent %s" +msgstr "Sände %s" -msgid "Dry-OK. Log says:\n" -msgstr "Test-OK. Loggen säger:\n" +msgid "Dry-OK. Log says:" +msgstr "Test-OK. Loggen säger:" -msgid "OK. Log says:\n" -msgstr "OK. Loggen säger:\n" +msgid "OK. Log says:" +msgstr "OK. Loggen säger:" msgid "Result: " msgstr "Resultat: " -msgid "Result: OK\n" -msgstr "Resultat: OK\n" +msgid "Result: OK" +msgstr "Resultat: OK" #, perl-format msgid "can't open file %s" @@ -96,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-29 01:09+0300\n" -"PO-Revision-Date: 2024-04-29 01:10+0300\n" +"POT-Creation-Date: 2024-07-19 13:59+0300\n" +"PO-Revision-Date: 2024-07-19 14:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -646,6 +646,10 @@ msgstr "" "p - geçerli parçalı yazdır\n" "? - yardımı yazdır\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Yalnızca bir harf bekleniyordu, '%s' alındı" + msgid "No previous hunk" msgstr "Öncesinde parça yok" @@ -694,9 +698,19 @@ msgstr "%d parçaya bölündü." msgid "Sorry, cannot edit this hunk" msgstr "Ãœzgünüm, bu parça düzenlenemiyor" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Bilinmeyen komut '%s' (yardım için '?')" + msgid "'git apply' failed" msgstr "'git apply' baÅŸarısız oldu" +msgid "No changes." +msgstr "DeÄŸiÅŸiklik yok." + +msgid "Only binary files changed." +msgstr "Yalnızca ikili dosyalar deÄŸiÅŸtirildi." + #, c-format msgid "" "\n" @@ -1545,6 +1559,9 @@ msgstr "pek büyük gitattributes dosyası '%s' dosyası yok sayılıyor" msgid "ignoring overly large gitattributes blob '%s'" msgstr "pek büyük gitattributes ikili nesnesi '%s' yok sayılıyor" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "depo olmadan --attr-source veya GIT_ATTR_SOURCE kullanılamaz" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "hatalı --attr-source veya GIT_ATTR_SOURCE" @@ -1862,13 +1879,6 @@ msgstr "%cx '%s' chmod yapılamıyor" msgid "Unstaged changes after refreshing the index:" msgstr "Ä°ndeksi yeniledikten sonra hazırlanmamış deÄŸiÅŸiklikler:" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"add.interactive.useBuiltin ayarı kaldırıldı!\n" -"Ayrıntılar için onun 'git help config' içindeki girdisine bakın." - msgid "could not read the index" msgstr "indeks okunamadı" @@ -1979,7 +1989,7 @@ msgid "adding embedded git repository: %s" msgstr "gömülü git deposu ekleniyor: %s" msgid "Use -f if you really want to add them." -msgstr "Onları gerçekten eklemek istiyorsanız -f kullanın." +msgstr "Onları eklemeyi gerçekten istiyorsanız -f kullanın." msgid "adding files failed" msgstr "dosya ekleme baÅŸarısız" @@ -2310,6 +2320,9 @@ msgstr "yamalama iÅŸlemini iptal et; ancak HEAD'i olduÄŸu yerde bırak" msgid "show the patch being applied" msgstr "uygulanmakta olan yamayı göster" +msgid "try to apply current patch again" +msgstr "yeniden geçerli yamayı uygulamaya çalış" + msgid "record the empty patch as an empty commit" msgstr "boÅŸ yamayı bir boÅŸ iÅŸleme olarak kayıt yaz" @@ -2366,9 +2379,6 @@ msgstr "git apply [<seçenekler>] [<yama>...]" msgid "could not redirect output" msgstr "çıktı yeniden yönlendirilemedi" -msgid "git archive: Remote with no URL" -msgstr "git archive: URL'si olmayan uzak konum" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: ACK/NAK bekleniyordu, floÅŸ paketi alındı" @@ -3261,6 +3271,9 @@ msgstr "Bir demet oluÅŸturmak için bir depo gerekli." msgid "do not show bundle details" msgstr "demet ayrıntılarını gösterme" +msgid "need a repository to verify a bundle" +msgstr "bir demeti doÄŸrulamak için bir depo gerekiyor" + #, c-format msgid "%s is okay\n" msgstr "%s tamam\n" @@ -4272,6 +4285,14 @@ msgid "failed to unlink '%s'" msgstr "'%s' baÄŸlantısı kesilemedi" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "sabit baÄŸlantı, '%s' konumunda denetlenemiyor" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "sabit baÄŸlantı, '%s' konumundaki kaynaktan farklı" + +#, c-format msgid "failed to create link '%s'" msgstr "'%s' bağı oluÅŸturulamadı" @@ -5104,15 +5125,51 @@ msgstr "" "Diskin dolu olup olmadığını ve kotanızı aşıp aÅŸmadığınızı denetleyin,\n" "sonra kurtarmak için \"git restore --staged :/\" kullanın." -msgid "git config [<options>]" -msgstr "git config [<seçenekler>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "" +"git config list [<dosya-seçeneÄŸi>] [<görüntüleme-seçeneÄŸi>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "tanımlanamayan --type argümanı, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<dosya-seçeneÄŸi>] [<görüntüleme-seçeneÄŸi>] [--includes] [--" +"all] [--regexp=<düzenli-ifade>] [--value=<deÄŸer>] [--fixed-value] [--" +"default=<öntanımlı>] <ad>" -msgid "only one type at a time" -msgstr "bir kerede yalnızca bir tür" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<dosya-seçeneÄŸi>] [--type=<tür>] [--all] [--value=<deÄŸer>] " +"[--fixed-value] <ad> <deÄŸer>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<dosya-seçeneÄŸi>] [--all] [--value=<deÄŸer>] [--fixed-" +"value] <ad> <deÄŸer>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<dosya-seçeneÄŸi>] <eski-ad> <yeni-ad>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<dosya-seçeneÄŸi>] <ad>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<dosya-seçeneÄŸi>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<dosya-seçeneÄŸi>] --get-colorbool <ad> [<stdout-tty>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<dosya-seçeneÄŸi>] [--type=<tür>] [--comment=<ileti>] [--all] " +"[--value=<deÄŸer>] [--fixed-value] <ad> <deÄŸer>" msgid "Config file location" msgstr "Yapılandırma dosyası konumu" @@ -5138,54 +5195,6 @@ msgstr "ikili nesne numarası" msgid "read config from given blob object" msgstr "verilen ikili nesneden yapılandırmayı oku" -msgid "Action" -msgstr "Eylem" - -msgid "get value: name [value-pattern]" -msgstr "deÄŸer al: ad [deÄŸer-dizgisi]" - -msgid "get all values: key [value-pattern]" -msgstr "tüm deÄŸerleri al: anahtar [deÄŸer-dizgisi]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "düzenli ifade için deÄŸerleri al: düzenli ifade adı [deÄŸer-dizgisi]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "URL için özel olan deÄŸeri al: bölüm[.var] URL" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "tüm eÅŸleÅŸen deÄŸiÅŸkenleri deÄŸiÅŸtir: ad deÄŸer [deÄŸer-dizgisi]" - -msgid "add a new variable: name value" -msgstr "yeni bir deÄŸiÅŸken ekle: ad deÄŸer" - -msgid "remove a variable: name [value-pattern]" -msgstr "bir deÄŸiÅŸken kaldır: ad [deÄŸer-dizgisi]" - -msgid "remove all matches: name [value-pattern]" -msgstr "tüm eÅŸleÅŸmeleri kaldır: ad [deÄŸer-dizgisi]" - -msgid "rename section: old-name new-name" -msgstr "bölümü yeniden adlandır: eski-ad yeni-ad" - -msgid "remove a section: name" -msgstr "bir bölümü kaldır: ad" - -msgid "list all" -msgstr "tümünü listele" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "deÄŸerleri 'deÄŸer-dizgisi' ile karşılaÅŸtırırken dizi eÅŸitliÄŸi kullan" - -msgid "open an editor" -msgstr "bir düzenleyici aç" - -msgid "find the color configured: slot [default]" -msgstr "yapılandırılan rengi bul: yuva [öntanımlı]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "renk ayarını bul: yuva [stdout tty]" - msgid "Type" msgstr "Tür" @@ -5213,8 +5222,8 @@ msgstr "deÄŸer bir yol (dosya veya dizin adı)" msgid "value is an expiry date" msgstr "deÄŸer bir son kullanım tarihi" -msgid "Other" -msgstr "DiÄŸer" +msgid "Display options" +msgstr "Seçenekleri görüntüle" msgid "terminate values with NUL byte" msgstr "deÄŸerleri NUL baytı ile sonlandır" @@ -5222,9 +5231,6 @@ msgstr "deÄŸerleri NUL baytı ile sonlandır" msgid "show variable names only" msgstr "yalnızca deÄŸiÅŸken adlarını göster" -msgid "respect include directives on lookup" -msgstr "arama sırasında içerme yönergelerine uy" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "yapılandırmanın kökenini göster (dosya, stdin, ikili nesne, komut satırı)" @@ -5234,14 +5240,15 @@ msgstr "" "yapılandırmanın kapsamını göster (çalışma aÄŸacı, yerel, global, sistem, " "komut)" -msgid "value" -msgstr "deÄŸer" +msgid "show config keys in addition to their values" +msgstr "deÄŸerlerine ek olarak yapılandırma anahtarlarını da göster" -msgid "with --get, use default value when missing entry" -msgstr "--get ile girdi verilmemiÅŸse öntanımlı deÄŸeri kullan" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "tanımlanamayan --type argümanı, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "kiÅŸi tarafından okunabilir yorum satırı (gerekirse önüne # koyulur)" +msgid "only one type at a time" +msgstr "bir kerede yalnızca bir tür" #, c-format msgid "wrong number of arguments, should be %d" @@ -5317,47 +5324,72 @@ msgstr "" "sürece birden çok çalışma aÄŸacı ile birlikte kullanılamaz. Ayrıntılar için\n" "lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun" -msgid "--get-color and variable type are incoherent" -msgstr "--get-color ve deÄŸiÅŸken türü tutarsız" +msgid "Other" +msgstr "DiÄŸer" -msgid "only one action at a time" -msgstr "bir kerede yalnızca bir eylem" +msgid "respect include directives on lookup" +msgstr "arama sırasında içerme yönergelerine uy" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only yalnızca ÅŸunlara uygulanabilir: --list, --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "'%s' yapılandırma dosyası okunamıyor" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"--show-origin yalnızca ÅŸunlara uygulanabilir: --get, --get-all, --get-regexp " -"ve --list" +msgid "error processing config file(s)" +msgstr "yapılandırma dosyaları iÅŸlenirken hata" -msgid "--default is only applicable to --get" -msgstr "--default yalnızca --get için uygulanabilir" +msgid "Filter options" +msgstr "Süzme seçenekleri" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment yalnızca ekle/ayarla/deÄŸiÅŸtir iÅŸlemlerine uygulanabilir" +msgid "return all values for multi-valued config options" +msgstr "birden çok deÄŸerli yapılandırma seçeneklerinin tüm deÄŸerlerini döndür" + +msgid "interpret the name as a regular expression" +msgstr "adı düzenli ifade olarak yorumla" + +msgid "show config with values matching the pattern" +msgstr "dizgiyle eÅŸleÅŸen deÄŸerleri olan yapılandırmayı göster" + +msgid "use string equality when comparing values to value pattern" +msgstr "deÄŸerleri deÄŸer dizgisiyle karşılaÅŸtırırken dizi eÅŸitliÄŸini kullan" + +msgid "URL" +msgstr "URL" + +msgid "show config matching the given URL" +msgstr "verilen URL ile eÅŸleÅŸen yapılandırmayı göster" + +msgid "value" +msgstr "deÄŸer" + +msgid "use default value when missing entry" +msgstr "girdi eksikse öntanımlı deÄŸeri kullan" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value yalnızca 'deÄŸer-dizgisi' ile uygulanır" -#, c-format -msgid "unable to read config file '%s'" -msgstr "'%s' yapılandırma dosyası okunamıyor" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default=, --all veya --url= ile kullanılamaz" -msgid "error processing config file(s)" -msgstr "yapılandırma dosyaları iÅŸlenirken hata" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url=; --all, --regexp veya --value ile kullanılamaz" -msgid "editing stdin is not supported" -msgstr "stdin'i düzenleme desteklenmiyor" +msgid "Filter" +msgstr "Süzgeç" -msgid "editing blobs is not supported" -msgstr "ikili nesneleri düzenleme desteklenmiyor" +msgid "replace multi-valued config option with new value" +msgstr "birden çok deÄŸerli yapılandırma seçeneÄŸini yeni deÄŸerle deÄŸiÅŸtir" -#, c-format -msgid "cannot create configuration file %s" -msgstr "%s yapılandırma dosyası oluÅŸturulamıyor" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "kiÅŸi tarafından okunabilir yorum satırı (gerekirse önüne # koyulur)" + +msgid "add a new line without altering any existing values" +msgstr "var olan herhangi deÄŸeri deÄŸiÅŸtirmeden yeni satır ekle" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value, yalnızca --value=<dizgi> ile geçerlidir" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append, --value=<dizgi> ile kullanılamaz" #, c-format msgid "" @@ -5372,6 +5404,86 @@ msgstr "" msgid "no such section: %s" msgstr "böyle bir bölüm yok: %s" +msgid "editing stdin is not supported" +msgstr "stdin'i düzenleme desteklenmiyor" + +msgid "editing blobs is not supported" +msgstr "ikili nesneleri düzenleme desteklenmiyor" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "%s yapılandırma dosyası oluÅŸturulamıyor" + +msgid "Action" +msgstr "Eylem" + +msgid "get value: name [<value-pattern>]" +msgstr "deÄŸer al: ad [<deÄŸer-dizgisi>]" + +msgid "get all values: key [<value-pattern>]" +msgstr "tüm deÄŸerleri al: anahtar [<deÄŸer-dizgisi>]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "düzenli ifade için deÄŸerleri al: düzenli ifade adı [<deÄŸer-dizgisi>]" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "URL için özel olan deÄŸeri al: bölüm[.var] URL" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "tüm eÅŸleÅŸen deÄŸiÅŸkenleri deÄŸiÅŸtir: ad deÄŸer [<deÄŸer-dizgisi>]" + +msgid "add a new variable: name value" +msgstr "yeni bir deÄŸiÅŸken ekle: ad deÄŸer" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "bir deÄŸiÅŸken kaldır: ad [<deÄŸer-dizgisi>]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "tüm eÅŸleÅŸmeleri kaldır: ad [<deÄŸer-dizgisi>]" + +msgid "rename section: old-name new-name" +msgstr "bölümü yeniden adlandır: eski-ad yeni-ad" + +msgid "remove a section: name" +msgstr "bir bölümü kaldır: ad" + +msgid "list all" +msgstr "tümünü listele" + +msgid "open an editor" +msgstr "bir düzenleyici aç" + +msgid "find the color configured: slot [<default>]" +msgstr "yapılandırılan rengi bul: yuva [<öntanımlı>]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "renk ayarını bul: yuva [<stdout-tty>]" + +msgid "with --get, use default value when missing entry" +msgstr "--get ile girdi verilmemiÅŸse öntanımlı deÄŸeri kullan" + +msgid "--get-color and variable type are incoherent" +msgstr "--get-color ve deÄŸiÅŸken türü tutarsız" + +msgid "no action specified" +msgstr "belirtilen eylem yok" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only yalnızca ÅŸunlara uygulanabilir: --list, --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin yalnızca ÅŸunlara uygulanabilir: --get, --get-all, --get-regexp " +"ve --list" + +msgid "--default is only applicable to --get" +msgstr "--default yalnızca --get için uygulanabilir" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment yalnızca ekle/ayarla/deÄŸiÅŸtir iÅŸlemlerine uygulanabilir" + msgid "print sizes in human readable format" msgstr "yazdırma boyutları kiÅŸi tarafından okunabilir biçimde" @@ -6194,6 +6306,9 @@ msgstr "yapılandırma" msgid "config key storing a list of repository paths" msgstr "bir depo yolları listesi tutan yapılandırma anahtarı" +msgid "keep going even if command fails in a repository" +msgstr "komut depoda baÅŸarısız olsa bile gitmeyi sürdür" + msgid "missing --config=<config>" msgstr "--config=<yapılandırma> eksik" @@ -7645,8 +7760,11 @@ msgstr "diziyi n. deneme olarak imle" msgid "max length of output filename" msgstr "çıktı dosya adının olabilecek en çok uzunluÄŸu" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "[PATCH] yerine [RFC PATCH] kullan" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "'PATCH' öncesi <rfc> ekle (öntanımlı 'RFC')" msgid "cover-from-description-mode" msgstr "açıklama kipinden kapak sayfası kipi" @@ -7909,11 +8027,12 @@ msgstr "" "kullanılamaz" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<yürütülebilir>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-" +"pack=<yürütülebilir>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<anahtar>]\n" " [--symref] [<depo> [<dizgiler>...]]" @@ -7929,8 +8048,11 @@ msgstr "uzak konum makinesindeki git-upload-pack yolu" msgid "limit to tags" msgstr "etiketlere kısıtla" -msgid "limit to heads" -msgstr "uç iÅŸlemelere kısıtla" +msgid "limit to branches" +msgstr "dallara kısıtla" + +msgid "deprecated synonym for --branches" +msgstr "--branches için artık kullanılmayan eÅŸanlamlı" msgid "do not show peeled tags" msgstr "soyulmuÅŸ etiketleri gösterme" @@ -10553,6 +10675,22 @@ msgstr "silmek için bir baÅŸvuru günlüğü belirtilmedi" msgid "invalid ref format: %s" msgstr "geçersiz baÅŸvuru biçimi: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<biçim> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "dönüştürülecek baÅŸvuru biçimini belirt" + +msgid "perform a non-destructive dry-run" +msgstr "yıkıcı olmayan bir deneme gerçekleÅŸtir" + +msgid "missing --ref-format=<format>" +msgstr "--ref-format=<biçim> eksik" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "depo halihazırda '%s' biçimini kullanıyor" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -10838,9 +10976,6 @@ msgstr "* uzak konum %s" msgid " Fetch URL: %s" msgstr " URL'yi getir: %s" -msgid "(no URL)" -msgstr "(URL yok)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -10849,6 +10984,9 @@ msgstr "(URL yok)" msgid " Push URL: %s" msgstr " URL'yi it: %s" +msgid "(no URL)" +msgstr "(URL yok)" + #, c-format msgid " HEAD branch: %s" msgstr " HEAD dalı: %s" @@ -10955,10 +11093,6 @@ msgstr "itme URL'lerinden çok getirme URL'lerini sorgula" msgid "return all URLs" msgstr "tüm URL'leri döndür" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "'%s' uzak konumu için URL yapılandırılmamış" - msgid "manipulate push URLs" msgstr "itme URL'lerini deÄŸiÅŸtir" @@ -11959,12 +12093,12 @@ msgstr "bilinmeyen saÄŸlama algoritması '%s'" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<dizgi>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<dizgi>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -11987,11 +12121,11 @@ msgstr "baÅŸvuru yok" msgid "failed to look up reference" msgstr "baÅŸvuru bakılamadı" -msgid "only show tags (can be combined with heads)" -msgstr "yalnızca etiketleri göster (dal uçlarıyla birlikte kullanılabilir)" +msgid "only show tags (can be combined with branches)" +msgstr "yalnızca etiketleri göster (dallarla birlikte kullanılabilir)" -msgid "only show heads (can be combined with tags)" -msgstr "yalnızca dal uçlarını göster (etiketlerle birlikte kullanılabilir)" +msgid "only show branches (can be combined with tags)" +msgstr "yalnızca dalları göster (etiketlerle birlikte kullanılabilir)" msgid "check for reference existence without resolving" msgstr "çözmeden baÅŸvuru varlığını denetle" @@ -12611,14 +12745,14 @@ msgstr "" "baÅŸka bir altmodülün git dizininde '%s' oluÅŸturma/kullanma reddediliyor" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması baÅŸarısız" - -#, c-format msgid "directory not empty: '%s'" msgstr "dizin boÅŸ deÄŸil: '%s'" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması baÅŸarısız" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s' için altmodül dizini alınamadı" @@ -12975,10 +13109,12 @@ msgstr "güncelleme nedeni" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <anahtar-kimliÄŸi>] [-f] [-m <ileti> | -F <dosya>] [-" "e]\n" +" [(--trailer <jeton>[(=|:)<deÄŸer>])...]\n" " <etiket-adı> [<iÅŸleme> | <nesne>]" msgid "git tag -d <tagname>..." @@ -13324,8 +13460,8 @@ msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -"core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleÄŸi gerçekten " -"devre dışı bırakmayı istiyorsanız bunu kaldırın veya deÄŸiÅŸtirin" +"core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleÄŸi devre " +"dışı bırakmayı gerçekten istiyorsanız bunu kaldırın veya deÄŸiÅŸtirin" msgid "Untracked cache disabled" msgstr "Ä°zlenmeyen önbellek devre dışı bırakıldı" @@ -13335,7 +13471,7 @@ msgid "" "to enable the untracked cache" msgstr "" "core.untrackedCache 'false' olarak ayarlanmış; izlenmeyen önbelleÄŸi " -"gerçekten etkinleÅŸtirmek istiyorsanız bunu kaldırın veya deÄŸiÅŸtirin" +"etkinleÅŸtirmeyi gerçekten istiyorsanız bunu kaldırın veya deÄŸiÅŸtirin" #, c-format msgid "Untracked cache enabled for '%s'" @@ -13343,8 +13479,8 @@ msgstr "Ä°zlenmeyen önbellek '%s' için etkinleÅŸtirildi" msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -"core.fsmonitor ayarlanmamış; dosya sistemin monitörünü gerçekten " -"etkinleÅŸtirmek istiyorsanız onu ayarlayın" +"core.fsmonitor ayarlanmamış; dosya sistemin monitörünü etkinleÅŸtirmeyi " +"gerçekten istiyorsanız onu ayarlayın" msgid "fsmonitor enabled" msgstr "dosya sistemi monitörü etkin" @@ -13352,8 +13488,8 @@ msgstr "dosya sistemi monitörü etkin" msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -"core.fsmonitor ayarlanmış; dosya sistemi monitörünü gerçekten devre dışı " -"bırakmak istiyorsanız onu kaldırın" +"core.fsmonitor ayarlanmış; dosya sistemi monitörünü devre dışı bırakmayı " +"gerçekten istiyorsanız onu kaldırın" msgid "fsmonitor disabled" msgstr "dosya sistemi monitörü devre dışı" @@ -13818,9 +13954,6 @@ msgstr "tanımlanamayan üstbilgi: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Depo aÅŸağıdaki önkoÅŸul iÅŸlemelere iye deÄŸil:" -msgid "need a repository to verify a bundle" -msgstr "bir demeti doÄŸrulamak için bir depo gerekiyor" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14217,6 +14350,9 @@ msgstr "Depoya ne itildiyse al" msgid "Manage reflog information" msgstr "BaÅŸvuru günlüğü bilgisini yönet" +msgid "Low-level access to refs" +msgstr "BaÅŸvurulara alt düzeyden eriÅŸim" + msgid "Manage set of tracked repositories" msgstr "Ä°zlenen depolar setini yönet" @@ -14521,6 +14657,14 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "" "commit-graph'ten gerekli OID çıkış sayısı iri parçası eksik veya hasarlı" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"uyumsuz ayarlardan dolayı '%s' commit-graph katmanı için olan Bloom " +"süzgeçleri devre dışı bırakılıyor" + msgid "commit-graph has no base graphs chunk" msgstr "commit-graph temel grafiÄŸi iri parçasına iye deÄŸil" @@ -14645,6 +14789,14 @@ msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"bir commit-graph yazılmaya çalışılıyor; ancak 'commitGraph." +"changedPathsVersion' (%d) desteklenmiyor" + msgid "too many commits to write graph" msgstr "grafik yazımı için pek fazla iÅŸleme" @@ -16488,17 +16640,21 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <yol>] [-c <ad>=<deÄŸer>]\n" " [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n" -" [--config-env=<ad>=<çevre-deÄŸiÅŸkeni>] <komut> [<argümanlar>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<ad>] [--config-env=<ad>=<çevre-" +"deÄŸiÅŸkeni>]\n" +" <komut> [<argümanlar>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16838,13 +16994,13 @@ msgstr "" "'%s' kancası yok sayıldı; çünkü bir yürütülebilir olarak ayarlanmamış.\n" "Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz." +msgid "not a git repository" +msgstr "bir git deposu deÄŸil" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "--packfile için argüman geçerli bir saÄŸlama olmalıdır ('%s' alındı)" -msgid "not a git repository" -msgstr "bir git deposu deÄŸil" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "http.postBuffer için negatif deÄŸer; %d olarak varsayılıyor" @@ -16855,6 +17011,9 @@ msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor" msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "Ortak anahtar iÄŸnelemesi cURL < 7.39.0 tarafından desteklenmiyor" +msgid "Unknown value for http.proactiveauth" +msgstr "http.proactiveauth için bilinmeyen deÄŸer" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor" @@ -16871,6 +17030,12 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "http.cookiefile '-' konumundan çerezleri okuma reddediliyor" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "boÅŸ http.cookiefile için http.savecookies yok sayılıyor" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -17047,8 +17212,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "%s altmodülü birleÅŸtirilemedi (iÅŸlemeler yok)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "%s altmodülü birleÅŸtirilemedi (depo hasarlı)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "hata: %s altmodülü birleÅŸtirilemedi (depo hasarlı)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17076,12 +17241,13 @@ msgstr "" "%s altmodülü birleÅŸtirilemedi; ancak birden çok olası birleÅŸtirmeler var:\n" "%s" -msgid "failed to execute internal merge" -msgstr "iç birleÅŸtirme yürütülemedi" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "hata: %s için iç birleÅŸtirme yürütülemedi" #, c-format -msgid "unable to add %s to database" -msgstr "%s veritabanına eklenemiyor" +msgid "error: unable to add %s to database" +msgstr "hata: %s veritabanına eklenemiyor" #, c-format msgid "Auto-merging %s" @@ -17178,12 +17344,12 @@ msgstr "" "ancak %s içinde silindi." #, c-format -msgid "cannot read object %s" -msgstr "%s nesnesi okunamıyor" +msgid "error: cannot read object %s" +msgstr "hata: %s nesnesi okunamıyor" #, c-format -msgid "object %s is not a blob" -msgstr "%s nesnesi ikili bir nesne deÄŸil" +msgid "error: object %s is not a blob" +msgstr "hata: %s nesnesi ikili bir nesne deÄŸil" #, c-format msgid "" @@ -17322,6 +17488,10 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "ÅŸununla ne yapılacağı bilinmiyor: %06o %s '%s'" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "%s altmodülü birleÅŸtirilemedi (depo hasarlı)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "%s altmodülü ÅŸu iÅŸlemeye ileri sarılıyor:" @@ -17360,6 +17530,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "%s altmodülü birleÅŸtirilemedi (birden çok birleÅŸtirme bulundu)" +msgid "failed to execute internal merge" +msgstr "iç birleÅŸtirme yürütülemedi" + +#, c-format +msgid "unable to add %s to database" +msgstr "%s veritabanına eklenemiyor" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -17464,6 +17641,14 @@ msgstr "" "ÇAKIÅžMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s " "içinde). Dizini %s->%s olarak adlandır (%s içinde)" +#, c-format +msgid "cannot read object %s" +msgstr "%s nesnesi okunamıyor" + +#, c-format +msgid "object %s is not a blob" +msgstr "%s nesnesi ikili bir nesne deÄŸil" + msgid "modify" msgstr "deÄŸiÅŸtir" @@ -17547,9 +17732,6 @@ msgstr "satır ayrıştırılamadı: %s" msgid "malformed line: %s" msgstr "hatalı oluÅŸturulmuÅŸ satır: %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "var olan multi-pack-index yok sayılıyor; saÄŸlama toplamı uyumsuzluÄŸu" - msgid "could not load pack" msgstr "paket yüklenemedi" @@ -17557,6 +17739,9 @@ msgstr "paket yüklenemedi" msgid "could not open index for %s" msgstr "%s için indeks açılamadı" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "var olan multi-pack-index yok sayılıyor; saÄŸlama toplamı uyumsuzluÄŸu" + msgid "Adding packfiles to multi-pack-index" msgstr "Paket dosyaları multi-pack-index'e ekleniyor" @@ -18160,6 +18345,17 @@ msgstr "nesne ayrıştırılamıyor: %s" msgid "hash mismatch %s" msgstr "saÄŸlama uyuÅŸmazlığı %s" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "biteÅŸlem indeksi yazılırken yinelenen girdi: %s" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "seçili olmayan iÅŸleme yazılmaya çalışıldı: '%s'" + +msgid "too many pseudo-merges" +msgstr "pek çok yalancı birleÅŸtirme" + msgid "trying to write commit not in index" msgstr "indekste olmayan iÅŸleme yazılmaya çalışılıyor" @@ -18184,6 +18380,20 @@ msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "" "hasarlı biteÅŸlem indeks dosyası (arama tablosuna sığmak için pek küçük)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"hasarlı biteÅŸlem indeks dosyası (yalancı birleÅŸtirme tablo üstbilgisine " +"sığmak için pek kısa)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" +"hasarlı biteÅŸlem indeks dosyası (yalancı birleÅŸtirme tablosuna sığmak için " +"pek kısa)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "hasarlı biteÅŸlem indeks dosyası, yalancı birleÅŸtirme tablosu pek kısa" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "biteÅŸlem indeksinde yinelenen girdi: '%s'" @@ -18274,6 +18484,10 @@ msgid "mismatch in bitmap results" msgstr "biteÅŸlem sonuçlarında uyuÅŸmazlık" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "yalancı birleÅŸtirme indeksi erim dışında (%<PRIu32> >= %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "öge bulunamadı: '%s'; '%s' paketinde, %<PRIuMAX> ofsetinde" @@ -18635,6 +18849,9 @@ msgstr "iÅŸ parçacıklarına ayrılmış 'lstat' oluÅŸturulamıyor: %s" msgid "unable to parse --pretty format" msgstr "--pretty biçimi ayrıştırılamıyor" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "gerekince getirme devre dışı; bazı nesneler kullanılamayabilir" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: getirme alt süreci çatallanamıyor" @@ -18658,6 +18875,67 @@ msgstr "object-info: argümanlardan sonra floÅŸ bekleniyordu" msgid "Removing duplicate objects" msgstr "YinelenmiÅŸ nesneler kaldırılıyor" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "%s için yalancı birleÅŸtirme düzenli ifadesi yüklenemedi: '%s'" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s negatif dışı bir deÄŸer olmalı, öntanımlı deÄŸer kullanılıyor" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s, 0 ve 1 arasında olmalıdır, öntanımlı kullanılıyor" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s pozitif olmalıdır, öntanımlı kullanılıyor" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "yalancı birleÅŸtirme grubu '%s' içinde gerekli dizgi yok" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "" +"yalancı birleÅŸtirme gribi '%s' içinde kararlıdan önce kararsız eÅŸik var" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"yapılandırmadaki yalancı birleÅŸtirme düzenli ifadesinde pek çok yakalama " +"grubu var (max=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"geniÅŸletilmiÅŸ yalancı birleÅŸtirme sınırlar dışında okundu (%<PRIuMAX> >= " +"%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"geniÅŸletilmiÅŸ yalancı birleÅŸtirme girdisi pek kısa (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "%s iÅŸlemesi için yalancı birleÅŸtirme bulunamadı, %<PRIuMAX> ofsetinde" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "" +"geniÅŸletilmiÅŸ yalancı birleÅŸtirme araması sınırlar dışında (%<PRIu32> >= " +"%<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "sınırlar dışında okundu: (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "%s iÅŸlemesi için geniÅŸletilmiÅŸ yalancı birleÅŸtirme tablosu okunamadı" + msgid "could not start `log`" msgstr "'log' baÅŸlatılamadı" @@ -19258,11 +19536,18 @@ msgstr "" msgid "log for %s is empty" msgstr "%s için olan günlük boÅŸ" +msgid "refusing to force and skip creation of reflog" +msgstr "baÅŸvuru günlüğünün oluÅŸturulma/atlanma zorlanması reddediliyor" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "hatalı ada iye '%s' baÅŸvurusunu güncelleme reddediliyor" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "'%s' yalancı baÅŸvurusunun güncellenmesi reddediliyor" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "'%s' baÅŸvurusu için update_ref baÅŸarısız oldu: %s" @@ -19293,6 +19578,25 @@ msgid "could not delete references: %s" msgstr "baÅŸvurular silinemedi: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "BaÅŸvuruların göç denemesi bitti, sonuç '%s' konumunda bulunabilir\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "geçici göç dizini '%s' kaldırılamadı" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "göç ettirilen baÅŸvurular '%s' konumunda bulunabilir" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"'%s' baÅŸvurusu kilitlenemiyor: '%s' hedefiyle bir sembolik baÅŸvuru " +"bekleniyordu; ancak bu normal bir baÅŸvuru" + +#, c-format msgid "refname is dangerous: %s" msgstr "baÅŸvuru adı tehlikeli: %s" @@ -19324,8 +19628,8 @@ msgstr "'%s' baÅŸvurusu kilitlenemiyor: BaÅŸvuruyu okurken hata" msgid "" "multiple updates for '%s' (including one via symref '%s') are not allowed" msgstr "" -"'%s' için birden çok güncellemeye ('%s' sembolik baÄŸlantısı ile olan bir " -"tanesini de içeren) izin verilmiyor" +"'%s' için birden çok güncellemeye ('%s' sembolik bağı ile olan bir tanesini " +"de içeren) izin verilmiyor" #, c-format msgid "cannot lock ref '%s': reference already exists" @@ -19357,7 +19661,7 @@ msgstr "baÅŸvuru adı %s bulunamadı" #, c-format msgid "refname %s is a symbolic ref, copying it is not supported" -msgstr "baÅŸvuru adı %s bir sembolik baÄŸlantı, onu kopyalamak desteklenmiyor" +msgstr "baÅŸvuru adı %s bir sembolik baÄŸ, onu kopyalamak desteklenmiyor" #, c-format msgid "invalid refspec '%s'" @@ -20443,6 +20747,50 @@ msgstr "" "update-ref, tümüyle kalifiye bir baÅŸvuru adı gerektiriyor; örn. refs/heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' birleÅŸtirme iÅŸlemelerini kabul etmiyor" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick', bir birleÅŸtirme iÅŸlemesi almaz. BirleÅŸtirmeyi\n" +"yeniden oynatmak istediyseniz iÅŸlemede 'merge -C' kullanın." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword', bir birleÅŸtirme iÅŸlemesi almaz. BirleÅŸtirmeyi\n" +"yeniden oynatmak ve iÅŸleme iletisini düzenlemek istediyseniz\n" +"iÅŸlemede 'merge -c' kullanın." + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'edit', bir birleÅŸtirme iÅŸlemesi almaz. BirleÅŸtirmeyi\n" +"yeniden oynatmak istediyseniz iÅŸlemede 'merge -C' kullanın,sonrasında " +"denetimin size geri verilmesi için 'break'\n" +"yapın; böylece 'git commit --amend && git rebase --continue'\n" +"yapabilirsiniz." + +msgid "cannot squash merge commit into another commit" +msgstr "birleÅŸtirme iÅŸlemesi baÅŸka bir iÅŸlemeye tıkıştırılamaz" + +#, c-format msgid "invalid command '%.*s'" msgstr "geçersiz komut %.*s" @@ -20558,9 +20906,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "HEAD okunamıyor" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "'%s', '%s' konumuna kopyalanamıyor" +msgid "could not write commit message file" +msgstr "iÅŸleme iletisi dosyası yazılamadı" #, c-format msgid "" @@ -20958,6 +21305,18 @@ msgstr "cwd'ye geri dönülemiyor" msgid "failed to stat '%*s%s%s'" msgstr "'%*s%s%s' bilgileri alınamadı" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"'%s' konumundaki depoda belirsiz iyelik algılandı\n" +"%sBu dizin için istisna eklemek için ÅŸunu çağırın:\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Åžu anki çalışma dizini okunamıyor" @@ -20979,18 +21338,6 @@ msgstr "" "ayarlanmamış)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"'%s' konumundaki depoda belirsiz iyelik algılandı\n" -"%sBu dizin için istisna eklemek için ÅŸunu çağırın:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "çıplak depo '%s', kullanılamaz (safe.bareRepository '%s')" @@ -21294,6 +21641,15 @@ msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde" #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"'%.*s' ögesinin bir sembolik baÄŸ olması beklenmiyordu, '%s' altmodül yolunda" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "'%s' altmodül yolunun bir sembolik baÄŸ olması beklenmiyordu" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -21331,10 +21687,6 @@ msgstr "'%s', lstat yapılamadı" msgid "no remote configured to get bundle URIs from" msgstr "demet URI'lerini almak için bir uzak konum yapılandırılmamış" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "'%s' uzak konumunun yapılandırılmış bir URL'si yok" - msgid "could not get the bundle-uri list" msgstr "bundle-uri listesi alınamadı" @@ -22790,24 +23142,24 @@ msgid "Failed to send %s\n" msgstr "%s gönderilemedi\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "%s gönderilir gibi yapıldı\n" +msgid "Dry-Sent %s" +msgstr "%s gönderilir gibi yapıldı" #, perl-format -msgid "Sent %s\n" -msgstr "%s gönderildi\n" +msgid "Sent %s" +msgstr "%s gönderildi" -msgid "Dry-OK. Log says:\n" -msgstr "Sınama tamam. Günlük çıktısı:\n" +msgid "Dry-OK. Log says:" +msgstr "Sınama tamam. Günlük çıktısı:" -msgid "OK. Log says:\n" -msgstr "Tamam. Günlük çıktısı:\n" +msgid "OK. Log says:" +msgstr "Tamam. Günlük çıktısı:" msgid "Result: " msgstr "Sonuç: " -msgid "Result: OK\n" -msgstr "Sonuç: Tamam\n" +msgid "Result: OK" +msgstr "Sonuç: Tamam" #, perl-format msgid "can't open file %s" @@ -22880,4 +23232,4 @@ msgstr "%s, yedek sonek '%s' ile atlanıyor.\n" #. TRANSLATORS: please keep "[y|N]" as is. #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: " +msgstr "%s ögesini göndermeyi gerçekten istiyor musunuz? [y|N]: " @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Git v2.45\n" +"Project-Id-Version: Git v2.46\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-27 09:55-0700\n" -"PO-Revision-Date: 2024-04-15 15:55-0700\n" +"POT-Creation-Date: 2023-04-11 09:55-0700\n" +"PO-Revision-Date: 2024-07-24 08:45-0700\n" "Last-Translator: Arkadii Yakovets <ark@cho.red>\n" "Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n" "Language: uk\n" @@ -565,6 +565,10 @@ msgstr "" "p - показати поточний шматок\n" "? - показати довідку\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "ОчікувавÑÑ Ð»Ð¸ÑˆÐµ один Ñимвол, отримано \"%s\"" + msgid "No previous hunk" msgstr "Ðемає попереднього шматка" @@ -614,9 +618,19 @@ msgstr "Розщепити на %d шматків." msgid "Sorry, cannot edit this hunk" msgstr "Вибачайте, не можу редагувати цей шматок" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "Ðевідома команда: \"%s\" (викориÑтовуйте \"?\" Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸)" + msgid "'git apply' failed" msgstr "\"git apply\" завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾" +msgid "No changes." +msgstr "Ðічого не змінено." + +msgid "Only binary files changed." +msgstr "Змінено лише бінарні файли." + #, c-format msgid "" "\n" @@ -1487,6 +1501,9 @@ msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ великого файлу gitattribu msgid "ignoring overly large gitattributes blob '%s'" msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ великих gitattributes blob \"%s\"" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "неможливо викориÑтати --attr-source або GIT_ATTR_SOURCE без Ñховища" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "невірний --attr-source або GIT_ATTR_SOURCE" @@ -1809,13 +1826,6 @@ msgstr "неможливо виконати chmod %cx \"%s\"" msgid "Unstaged changes after refreshing the index:" msgstr "ÐеіндекÑовані зміни піÑÐ»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу:" -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"параметр add.interactive.useBuiltin було видалено!\n" -"ДивітьÑÑ Ð·Ð°Ð¿Ð¸Ñ Ñƒ \"git help config\" Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної інформації." - msgid "could not read the index" msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ індекÑ" @@ -2258,6 +2268,9 @@ msgstr "перервати латаннÑ, але залишити HEAD на Ñ‚Ð msgid "show the patch being applied" msgstr "показати латку, що заÑтоÑовуєтьÑÑ" +msgid "try to apply current patch again" +msgstr "Ñпробувати заÑтоÑувати поточну латку ще раз" + msgid "record the empty patch as an empty commit" msgstr "запиÑати порожню латку Ñк порожній коміт" @@ -2314,9 +2327,6 @@ msgstr "git apply [<опції>] [<латка>...]" msgid "could not redirect output" msgstr "неможливо перенаправити вивід" -msgid "git archive: Remote with no URL" -msgstr "git archive: віддалене Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÐµÐ· URL" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: очікувалоÑÑŒ ACK/NAK, отримано flush-пакет" @@ -3231,6 +3241,9 @@ msgstr "Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° потрібне Ñховище msgid "do not show bundle details" msgstr "не показувати деталі пакунка" +msgid "need a repository to verify a bundle" +msgstr "потрібне Ñховище Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ пакунка" + #, c-format msgid "%s is okay\n" msgstr "%s у порÑдку\n" @@ -4262,6 +4275,14 @@ msgid "failed to unlink '%s'" msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\"" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "неможливо перевірити жорÑтке поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "жорÑтке поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ñ€Ñ–Ð·Ð½ÑєтьÑÑ Ð²Ñ–Ð´ джерела в \"%s\"" + +#, c-format msgid "failed to create link '%s'" msgstr "не вдалоÑÑ Ñтворити поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" @@ -5095,15 +5116,50 @@ msgstr "" "новий файл індекÑу. ПереконайтеÑÑ, що диÑк не переповнений Ñ– квота\n" "не перевищена, а потім виконайте \"git restore --staged :/\" Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ." -msgid "git config [<options>]" -msgstr "git config [<опції>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<опціÑ-файлу>] [<опціÑ-відображеннÑ>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "нерозпізнаний аргумент --type, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<опціÑ-файлу>] [<опціÑ-відображеннÑ>] [--includes] [--all] " +"[--regexp=<регвир>] [--value=<значеннÑ>] [--fixed-value] [--" +"default=<Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ -за-умовчаннÑм>] <назва>" -msgid "only one type at a time" -msgstr "лише один тип за раз" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<опціÑ-файлу>] [--type=<тип>] [--all] [--value=<значеннÑ>] " +"[--fixed-value] <назва> <значеннÑ>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<опціÑ-файлу>] [--all] [--value=<значеннÑ>] [--fixed-" +"value] <назва> <значеннÑ>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<опціÑ-файлу>] <Ñтара-назва> <нова-назва>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<опціÑ-файлу>] <назва>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<опціÑ-файлу>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<опціÑ-файлу>] --get-colorbool <назва> [<stdout-is-tty>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<опціÑ-файлу>] [--type=<тип>] [--comment=<допиÑ>] [--all][--" +"value=<значеннÑ>] [--fixed-value] <назва> <значеннÑ>" msgid "Config file location" msgstr "Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ конфігурації" @@ -5129,55 +5185,6 @@ msgstr "blob-id" msgid "read config from given blob object" msgstr "прочитати конфігурацію з наданого blob-обʼєкту" -msgid "Action" -msgstr "ДіÑ" - -msgid "get value: name [value-pattern]" -msgstr "отримати значеннÑ: назва [шаблон-значеннÑ]" - -msgid "get all values: key [value-pattern]" -msgstr "отримати вÑÑ– значеннÑ: ключ [шаблон-значеннÑ]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "отримати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ€ÐµÐ³Ð²Ð¸Ñ€Ñƒ: регвир-назви [шаблон-значеннÑ]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "отримати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ñ— URL-адреÑи: розділ[.var] URL-адреÑа" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "замінити вÑÑ– відповідні змінні: назва Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ [шаблон-значеннÑ]" - -msgid "add a new variable: name value" -msgstr "додати нову змінну: назва значеннÑ" - -msgid "remove a variable: name [value-pattern]" -msgstr "видалити змінну: назва [шаблон-значеннÑ]" - -msgid "remove all matches: name [value-pattern]" -msgstr "видалити вÑÑ– збіги: назва [шаблон-значеннÑ]" - -msgid "rename section: old-name new-name" -msgstr "перейменувати розділ: Ñтара-назва нова-назва" - -msgid "remove a section: name" -msgstr "видалити розділ: назва" - -msgid "list all" -msgstr "показати вÑÑ– змінні" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "" -"викориÑтовувати рівніÑÑ‚ÑŒ Ñтрок при порівнÑнні значень з \"шаблон-значеннÑм\"" - -msgid "open an editor" -msgstr "відкрити редактор" - -msgid "find the color configured: slot [default]" -msgstr "знайти налаштований колір: Ñлот [за замовчуваннÑм]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "знайти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ: slot [stdout-is-tty]" - msgid "Type" msgstr "Тип" @@ -5205,8 +5212,8 @@ msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑˆÐ»ÑÑ… (файл або назва директорі msgid "value is an expiry date" msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ - дата Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ñƒ дії" -msgid "Other" -msgstr "Інше" +msgid "Display options" +msgstr "Опції відображеннÑ" msgid "terminate values with NUL byte" msgstr "завершити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±Ð°Ð¹Ñ‚Ð¾Ð¼ NUL" @@ -5214,9 +5221,6 @@ msgstr "завершити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±Ð°Ð¹Ñ‚Ð¾Ð¼ NUL" msgid "show variable names only" msgstr "показувати тільки назви змінних" -msgid "respect include directives on lookup" -msgstr "дотримуватиÑÑŒ директив Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ пошуку" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "показати Ð¿Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— (файл, Ñтандартний ввід, blob, командний " @@ -5227,16 +5231,15 @@ msgstr "" "показати межі дії конфігурації (робоче дерево, локально, глобально, ÑиÑтема, " "команда)" -msgid "value" -msgstr "значеннÑ" +msgid "show config keys in addition to their values" +msgstr "показувати ключі конфігурації на додачу до їхніх значень" -msgid "with --get, use default value when missing entry" -msgstr "" -"з --get викориÑтовувати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм, Ñкщо Ð·Ð°Ð¿Ð¸Ñ Ð²Ñ–Ð´Ñутній" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "нерозпізнаний аргумент --type, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "" -"зрозумілий Ð´Ð»Ñ Ð»ÑŽÐ´Ð¸Ð½Ð¸ Ñ€Ñдок ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ (# буде додано перед за потребою)" +msgid "only one type at a time" +msgstr "лише один тип за раз" #, c-format msgid "wrong number of arguments, should be %d" @@ -5314,46 +5317,75 @@ msgstr "" "ФÐЙЛ\"\n" "у \"git help worktree\" Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної інформації" -msgid "--get-color and variable type are incoherent" -msgstr "--get-color Ñ– тип змінної не узгоджуютьÑÑ" +msgid "Other" +msgstr "Інше" -msgid "only one action at a time" -msgstr "лише одна Ð´Ñ–Ñ Ð·Ð° раз" +msgid "respect include directives on lookup" +msgstr "дотримуватиÑÑŒ директив Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ пошуку" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --list або --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл конфігурації \"%s\"" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" +msgid "error processing config file(s)" +msgstr "помилка при обробці файлу(ів) конфігурації" + +msgid "Filter options" +msgstr "Опції фільтрації" + +msgid "return all values for multi-valued config options" +msgstr "повернути вÑÑ– Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾Ð·Ð½Ð°Ñ‡Ð½Ð¸Ñ… параметрів конфігурації" + +msgid "interpret the name as a regular expression" +msgstr "інтерпретувати назву Ñк регулÑрний вираз" + +msgid "show config with values matching the pattern" +msgstr "показати конфіг зі значеннÑми, що відповідають шаблону" + +msgid "use string equality when comparing values to value pattern" msgstr "" -"--show-origin заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --get, --get-all, --get-regexp та --list" +"викориÑтовувати Ñ€Ñдкову еквівалентніÑÑ‚ÑŒ при порівнÑнні з шаблоном значень" -msgid "--default is only applicable to --get" -msgstr "--default заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --get" +msgid "URL" +msgstr "URL" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до add/set/replace операцій" +msgid "show config matching the given URL" +msgstr "показати конфіг, що відповідає вказаній URL-адреÑÑ–" + +msgid "value" +msgstr "значеннÑ" + +msgid "use default value when missing entry" +msgstr "викориÑтовувати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм, Ñкщо Ð·Ð°Ð¿Ð¸Ñ Ð²Ñ–Ð´Ñутній" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ з \"шаблоном-значеннÑ\"" -#, c-format -msgid "unable to read config file '%s'" -msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл конфігурації \"%s\"" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= не можна викориÑтовувати з --all або --url=" -msgid "error processing config file(s)" -msgstr "помилка при обробці файлу(ів) конфігурації" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= не можна викориÑтовувати з --all, --regexp або --value" -msgid "editing stdin is not supported" -msgstr "Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ stdin не підтримуєтьÑÑ" +msgid "Filter" +msgstr "ФільтраціÑ" -msgid "editing blobs is not supported" -msgstr "Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ blobs не підтримуєтьÑÑ" +msgid "replace multi-valued config option with new value" +msgstr "замінити багатозначний параметр конфігурації новим значеннÑм" -#, c-format -msgid "cannot create configuration file %s" -msgstr "неможливо Ñтворити конфігураційний файл %s" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "" +"зрозумілий Ð´Ð»Ñ Ð»ÑŽÐ´Ð¸Ð½Ð¸ Ñ€Ñдок ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ (# буде додано попереду при " +"необхідноÑÑ‚Ñ–)" + +msgid "add a new line without altering any existing values" +msgstr "додати новий Ñ€Ñдок, не змінюючи жодного з Ñ–Ñнуючих значень" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ з --value=<шаблон>" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append не можна викориÑтовувати з --value=<шаблон>" #, c-format msgid "" @@ -5367,6 +5399,87 @@ msgstr "" msgid "no such section: %s" msgstr "немає такого розділу: %s" +msgid "editing stdin is not supported" +msgstr "Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ stdin не підтримуєтьÑÑ" + +msgid "editing blobs is not supported" +msgstr "Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ blobs не підтримуєтьÑÑ" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "неможливо Ñтворити конфігураційний файл %s" + +msgid "Action" +msgstr "ДіÑ" + +msgid "get value: name [<value-pattern>]" +msgstr "отримати значеннÑ: назва [шаблон-значеннÑ]" + +msgid "get all values: key [<value-pattern>]" +msgstr "отримати вÑÑ– значеннÑ: ключ [шаблон-значеннÑ]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "отримати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ€ÐµÐ³Ð²Ð¸Ñ€Ñƒ: регвир-назви [шаблон-значеннÑ]" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "" +"отримати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ñ— URL-адреÑи: розділ[.змінна] URL-адреÑа" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "замінити вÑÑ– відповідні змінні: назва Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ [шаблон-значеннÑ]" + +msgid "add a new variable: name value" +msgstr "додати нову змінну: назва значеннÑ" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "видалити змінну: назва [шаблон-значеннÑ]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "видалити вÑÑ– збіги: назва [шаблон-значеннÑ]" + +msgid "rename section: old-name new-name" +msgstr "перейменувати розділ: Ñтара-назва нова-назва" + +msgid "remove a section: name" +msgstr "видалити розділ: назва" + +msgid "list all" +msgstr "показати вÑÑ– змінні" + +msgid "open an editor" +msgstr "відкрити редактор" + +msgid "find the color configured: slot [<default>]" +msgstr "знайти налаштований колір: Ñлот [<за замовчуваннÑм>]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "знайти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð»ÑŒÐ¾Ñ€Ñƒ: Ñлот [<stdout-is-tty>]" + +msgid "with --get, use default value when missing entry" +msgstr "" +"з --get викориÑтовувати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм, Ñкщо Ð·Ð°Ð¿Ð¸Ñ Ð²Ñ–Ð´Ñутній" + +msgid "--get-color and variable type are incoherent" +msgstr "--get-color Ñ– тип змінної не узгоджуютьÑÑ" + +msgid "no action specified" +msgstr "дію не зазначено" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --list або --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --get, --get-all, --get-regexp та --list" + +msgid "--default is only applicable to --get" +msgstr "--default заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до --get" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment заÑтоÑовуєтьÑÑ Ð»Ð¸ÑˆÐµ до add/set/replace операцій" + msgid "print sizes in human readable format" msgstr "показувати розмір у зручному Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñ–" @@ -6200,6 +6313,10 @@ msgstr "конфіг" msgid "config key storing a list of repository paths" msgstr "ключ конфігурації, в Ñкому зберігаєтьÑÑ ÑпиÑок шлÑхів до Ñховищ" +msgid "keep going even if command fails in a repository" +msgstr "" +"продовжувати роботу, навіть Ñкщо команда завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ в репозиторії" + msgid "missing --config=<config>" msgstr "відÑутній --config=<конфіг>" @@ -7666,8 +7783,11 @@ msgstr "позначити Ñ€Ñд Ñк N-не перекиданнÑ" msgid "max length of output filename" msgstr "макÑимальна довжина назви вихідного файлу" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "викориÑтати [RFC PATCH] заміÑÑ‚ÑŒ [PATCH]" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "додати <rfc> (за замовчуваннÑм \"RFC\") перед \"PATCH\"" msgid "cover-from-description-mode" msgstr "cover-from-description-mode" @@ -7937,11 +8057,12 @@ msgstr "" "deduplicate, --eol" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<виконавчий-файл>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<виконавчий-" +"файл>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<ключ>]\n" " [--symref] [<Ñховище> [<шаблони>...]]" @@ -7957,8 +8078,11 @@ msgstr "шлÑÑ… до git-upload-pack на віддаленому Ñервері msgid "limit to tags" msgstr "обмежити до тегів" -msgid "limit to heads" -msgstr "обмежити до голів" +msgid "limit to branches" +msgstr "обмежити до гілок" + +msgid "deprecated synonym for --branches" +msgstr "заÑтарілий Ñинонім до --branches" msgid "do not show peeled tags" msgstr "не показувати очищені теги" @@ -10619,6 +10743,22 @@ msgstr "не вказано журнал поÑилань Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð msgid "invalid ref format: %s" msgstr "неприпуÑтимий формат поÑиланнÑ: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<формат> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "вкажіть формат поÑиланнÑ, в Ñкий потрібно конвертувати" + +msgid "perform a non-destructive dry-run" +msgstr "виконати неруйнівний пробний запуÑк" + +msgid "missing --ref-format=<format>" +msgstr "відÑутній --ref-format=<формат>" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "Ñховище вже викориÑтовує формат \"%s\"" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -10907,9 +11047,6 @@ msgstr "* віддалене %s" msgid " Fetch URL: %s" msgstr " URL-адреÑа отриманнÑ: %s" -msgid "(no URL)" -msgstr "(без URL-адреÑи)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -10918,6 +11055,9 @@ msgstr "(без URL-адреÑи)" msgid " Push URL: %s" msgstr " URL-адреÑа надÑиланнÑ: %s" +msgid "(no URL)" +msgstr "(без URL-адреÑи)" + #, c-format msgid " HEAD branch: %s" msgstr " HEAD гілка: %s" @@ -11030,10 +11170,6 @@ msgstr "запитувати URL-адреÑи надÑилань заміÑÑ‚ÑŒ msgid "return all URLs" msgstr "повернути вÑÑ– URL-адреÑи" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "не налаштовано URL-адреÑи Ð´Ð»Ñ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ \"%s\"" - msgid "manipulate push URLs" msgstr "маніпулювати URL-адреÑами надÑиланнÑ" @@ -11402,7 +11538,7 @@ msgid "only one pattern can be given with -l" msgstr "тільки один шаблон може бути заданий з -l" msgid "need some commits to replay" -msgstr "потрібні деÑкі комміти Ð´Ð»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ" +msgstr "потрібні деÑкі коміти Ð´Ð»Ñ Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ" msgid "--onto and --advance are incompatible" msgstr "--onto та --advance неÑуміÑні" @@ -11468,7 +11604,7 @@ msgid "replaying down to root commit is not supported yet!" msgstr "Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð¾ кореневого коміту поки що не підтримуєтьÑÑ!" msgid "replaying merge commits is not supported yet!" -msgstr "Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð¼Ñ–Ñ‚Ñ–Ð² Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ð¾ÐºÐ¸ що не підтримуєтьÑÑ!" +msgstr "Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ð¾ÐºÐ¸ що не підтримуєтьÑÑ!" msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -12047,12 +12183,12 @@ msgstr "Ðевідомий хеш-алгоритм" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<н>]] [--abbrev[=<н>]] [--tags]\n" -" [--heads] [--] [<шаблон>...]" +" [-s | --hash[=<н>]] [--abbrev[=<н>]] [--branches] [--tags]\n" +" [--] [<шаблон>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -12075,11 +12211,11 @@ msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ Ñ–Ñнує" msgid "failed to look up reference" msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ поÑиланнÑ" -msgid "only show tags (can be combined with heads)" -msgstr "показати тільки теги (можна комбінувати з верхівками)" +msgid "only show tags (can be combined with branches)" +msgstr "показати тільки теги (можна комбінувати з гілками)" -msgid "only show heads (can be combined with tags)" -msgstr "показати тільки верхівки (можна комбінувати з тегами)" +msgid "only show branches (can be combined with tags)" +msgstr "показати тільки гілки (можна комбінувати з тегами)" msgid "check for reference existence without resolving" msgstr "перевірÑти наÑвніÑÑ‚ÑŒ поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð±ÐµÐ· розвʼÑзаннÑ" @@ -12714,14 +12850,14 @@ msgstr "" "відмовлено в Ñтворенні/викориÑтанні \"%s\" у git директорії іншого підмодулÑ" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "не вдалоÑÑ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" у шлÑÑ… Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" - -#, c-format msgid "directory not empty: '%s'" msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð½Ðµ порожнÑ: \"%s\"" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "не вдалоÑÑ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" у шлÑÑ… Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\"" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ директорію Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ \"%s\"" @@ -13086,14 +13222,16 @@ msgstr "причина оновленнÑ" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <ідентифікатор-ключа>] [-f] [-m <допиÑ> | -F <файл>] [-" "e]\n" +" [(--trailer <токен>[(=|:)<значеннÑ>])...]\n" " <назва-тегу> [<коміт> | <об’єкт>]" msgid "git tag -d <tagname>..." -msgstr "git tag -d <назва-тега>..." +msgstr "git tag -d <назва-тегу>..." msgid "" "git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" @@ -13948,9 +14086,6 @@ msgstr "нерозпізнаний заголовок: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "У Ñховищі не виÑтачає обовʼÑзкових комітів:" -msgid "need a repository to verify a bundle" -msgstr "потрібне Ñховище Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ пакунка" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14353,6 +14488,9 @@ msgstr "Отримати те, що надÑилаєтьÑÑ Ð´Ð¾ Ñховища msgid "Manage reflog information" msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ”ÑŽ журналу поÑилань" +msgid "Low-level access to refs" +msgstr "Ðизькорівневий доÑтуп до поÑилань" + msgid "Manage set of tracked repositories" msgstr "Керувати набором відÑтежуваних Ñховищ" @@ -14364,8 +14502,8 @@ msgstr "Створити, показати, видалити поÑÐ¸Ð»Ð°Ð½Ð½Ñ msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" msgstr "" -"ЕКСПЕРИМЕÐТÐЛЬÐО: Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð¼Ñ–Ñ‚Ñ–Ð² на новій базі також працює з " -"порожніми Ñховищами" +"ЕКСПЕРИМЕÐТÐЛЬÐО: Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² на новій базі також працює з порожніми " +"Ñховищами" msgid "Generates a summary of pending changes" msgstr "Створює підÑумок змін Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð»Ñду" @@ -14440,7 +14578,7 @@ msgid "Initialize, update or inspect submodules" msgstr "Ініціалізувати, оновити або перевірити підмодулі" msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "Двонаправлена Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð¼Ñ–Ð¶ Subversion Ñховищем та Git" +msgstr "ДвонапрÑмлена Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð¼Ñ–Ð¶ Subversion Ñховищем та Git" msgid "Switch branches" msgstr "Переключити гілки" @@ -14656,6 +14794,14 @@ msgstr "необхідний шматок OID lookup коміт-графа віРmsgid "commit-graph required commit data chunk missing or corrupted" msgstr "необхідний шматок commit data коміт-графа відÑутній або пошкоджений" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€Ñ–Ð² Блума Ð´Ð»Ñ ÑˆÐ°Ñ€Ñƒ коміт-графа \"%s\" через неÑуміÑніÑÑ‚ÑŒ " +"параметрів" + msgid "commit-graph has no base graphs chunk" msgstr "коміт-граф не має шматка базових графів" @@ -14780,6 +14926,14 @@ msgstr "Ð—Ð»Ð¸Ñ‚Ñ‚Ñ ÐºÐ¾Ð¼Ñ–Ñ‚-графа" msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "Ñпроба запиÑати коміт-граф, але \"core.commitGraph\" відключено" +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"Ñпроба запиÑати коміт-граф, але \"commitGraph.changedPathsVersion\" (%d) не " +"підтримуєтьÑÑ" + msgid "too many commits to write graph" msgstr "занадто багато комітів, щоб запиÑати граф" @@ -16635,17 +16789,21 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <шлÑÑ…>] [-c <назва>=<значеннÑ>]\n" " [--exec-path[=<шлÑÑ…>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<шлÑÑ…>] [--work-tree=<шлÑÑ…>] [--namespace=<назва>]\n" -"[--config-env=<назва>=<змінна-оточеннÑ>] <команда> [<аргументи>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<шлÑÑ…>]\n" +" [--work-tree=<шлÑÑ…>] [--namespace=<назва>] [--config-" +"env=<шлÑÑ…>=<змінна-оточеннÑ>]\n" +" <команда> [<аргументи>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16988,13 +17146,13 @@ msgstr "" "Ви можете вимкнути це Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð·Ð° допомогою \"git config advice." "ignoredHook false\"." +msgid "not a git repository" +msgstr "не Ñ” git Ñховищем" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "аргумент до --packfile має бути коректним хешем (отримано \"%s\")" -msgid "not a git repository" -msgstr "не Ñ” git Ñховищем" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "" @@ -17006,6 +17164,9 @@ msgstr "Контроль Ð´ÐµÐ»ÐµÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "Ð—Ð°ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ñ… ключів не підтримуєтьÑÑ Ð· cURL < 7.39.0" +msgid "Unknown value for http.proactiveauth" +msgstr "Ðевідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ http.proactiveauth" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE не підтримуєтьÑÑ Ð· cURL < 7.44.0" @@ -17023,6 +17184,12 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Ðе вдалоÑÑ Ð²Ñтановити SSL обробник в \"%s\": вже вÑтановлено" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "відмова від Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ cookies з http.cookiefile \"-\"" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ http.savecookies Ð´Ð»Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½ÑŒÐ¾Ð³Ð¾ http.cookiefile" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -17198,8 +17365,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ підмодуль %s (відÑутні коміти)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "Ðе вдалоÑÑ Ð¾Ð±Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ підмодуль %s (Ñховище пошкоджено)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "помилка: не вдалоÑÑ Ð¾Ð±Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ підмодуль %s (Ñховище пошкоджено)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17226,12 +17393,13 @@ msgstr "" "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ підмодуль %s, але Ñ–Ñнує кілька можливих варіантів злиттÑ:\n" "%s" -msgid "failed to execute internal merge" -msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ внутрішнє злиттÑ" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "помилка: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ внутрішнє Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ %s" #, c-format -msgid "unable to add %s to database" -msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ %s до бази даних" +msgid "error: unable to add %s to database" +msgstr "помилка: не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ %s до бази даних" #, c-format msgid "Auto-merging %s" @@ -17328,12 +17496,12 @@ msgstr "" "в %s." #, c-format -msgid "cannot read object %s" -msgstr "неможливо прочитати обʼєкт %s" +msgid "error: cannot read object %s" +msgstr "помилка: неможливо прочитати обʼєкт %s" #, c-format -msgid "object %s is not a blob" -msgstr "обʼєкт %s не Ñ” blob" +msgid "error: object %s is not a blob" +msgstr "помилка: обʼєкт %s не Ñ” blob" #, c-format msgid "" @@ -17470,6 +17638,10 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "не знаю, що робити з %06o %s \"%s\"" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "Ðе вдалоÑÑ Ð¾Ð±Ê¼Ñ”Ð´Ð½Ð°Ñ‚Ð¸ підмодуль %s (Ñховище пошкоджено)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¾Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ %s вперед до наÑтупного коміту:" @@ -17508,6 +17680,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Ðе вдалоÑÑ Ð·Ð»Ð¸Ñ‚Ð¸ підмодуль %s (знайдено більше одного злиттÑ)" +msgid "failed to execute internal merge" +msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ внутрішнє злиттÑ" + +#, c-format +msgid "unable to add %s to database" +msgstr "не вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ %s до бази даних" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -17610,6 +17789,14 @@ msgstr "" "КОÐФЛІКТ (перейменовано/перейменовано): перейменовано директорію %s->%s в " "%s. Перейменовано директорію %s->%s в %s" +#, c-format +msgid "cannot read object %s" +msgstr "неможливо прочитати обʼєкт %s" + +#, c-format +msgid "object %s is not a blob" +msgstr "обʼєкт %s не Ñ” blob" + msgid "modify" msgstr "змінити" @@ -17693,10 +17880,6 @@ msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ Ñ€Ñдок: %s" msgid "malformed line: %s" msgstr "невірно Ñформований Ñ€Ñдок: %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "" -"Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ñнуючого multi-pack-index; невідповідніÑÑ‚ÑŒ контрольних Ñум" - msgid "could not load pack" msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ пакунок" @@ -17704,6 +17887,10 @@ msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ пакунок" msgid "could not open index for %s" msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð»Ñ %s" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" +"Ñ–Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ñнуючого multi-pack-index; невідповідніÑÑ‚ÑŒ контрольних Ñум" + msgid "Adding packfiles to multi-pack-index" msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑ–Ð² до multi-pack-index" @@ -18317,6 +18504,17 @@ msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ обʼєкт: %s" msgid "hash mismatch %s" msgstr "невідповідніÑÑ‚ÑŒ хешу %s" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "дубльований елемент під Ñ‡Ð°Ñ Ð·Ð°Ð¿Ð¸Ñу bitmap індекÑу: \"%s\"" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "Ñпроба зберегти невибраний коміт: \"%s\"" + +msgid "too many pseudo-merges" +msgstr "занадто багато пÑевдозлиттÑ" + msgid "trying to write commit not in index" msgstr "Ñпроба запиÑати коміт, Ñкого немає в індекÑÑ–" @@ -18339,8 +18537,21 @@ msgstr "" msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "" +"пошкоджений файл bitmap індекÑу (занадто малий, щоб вміÑтити таблицю пошуку)" + +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"пошкоджений файл bitmap індекÑу (занадто малий, щоб вміÑтити заголовок " +"таблиці пÑевдозлиттÑ" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "" "пошкоджений файл bitmap індекÑу (занадто короткий, щоб вміÑтити таблицю " -"пошуку)" +"пÑевдозлиттÑ)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "пошкоджений файл bitmap індекÑу, Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ мала" #, c-format msgid "duplicate entry in bitmap index: '%s'" @@ -18437,6 +18648,10 @@ msgid "mismatch in bitmap results" msgstr "розбіжніÑÑ‚ÑŒ в bitmap результатах" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "Ñ–Ð½Ð´ÐµÐºÑ Ð¿ÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ð¾Ð·Ð° діапазоном (%<PRIu32> >= %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ \"%s\" у пакунку \"%s\" зі зміщеннÑм %<PRIuMAX>" @@ -18808,6 +19023,9 @@ msgstr "не вдалоÑÑ Ñтворити потоковий lstat: %s" msgid "unable to parse --pretty format" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ --pretty формат" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "лінива вибірка вимкнена; деÑкі обʼєкти можуть бути недоÑтупні" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: не вдалоÑÑ Ñ€Ð¾Ð·Ð³Ð°Ð»ÑƒÐ¶Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ" @@ -18831,6 +19049,65 @@ msgstr "object-info: очікувавÑÑ flush піÑÐ»Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð²" msgid "Removing duplicate objects" msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð´ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ‚Ñ–Ð² обʼєктів" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ регвир пÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ %s: \"%s\"" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "" +"%s має бути невідʼємним значеннÑм, викориÑтано Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "" +"%s має бути в діапазоні від 0 до 1, викориÑтано Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s має бути додатнім, викориÑтано Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "у групі пÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ \"%s\" відÑутній потрібний шаблон" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "група пÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ \"%s\" має неÑтабільний поріг перед Ñтабільним" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"регвир пÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð· конфігурації має забагато груп Ð·Ð°Ñ…Ð¾Ð¿Ð»ÐµÐ½Ð½Ñ " +"(max=%<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð·Ð° межами (%<PRIuMAX> >= %<PRIuMAX>) при розширеному пÑевдозлитті" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "" +"Ð·Ð°Ð¿Ð¸Ñ Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ð³Ð¾ пÑÐµÐ²Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ малий (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ пÑÐµÐ²Ð¾Ð´Ð¾Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð° %s зі зміщеннÑм %<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "розширене пÑевдозлиттÑ, пошук за межами (%<PRIu32> >= %<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð·Ð° межами: (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ таблицю розширеного пÑевдо-Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ %s" + msgid "could not start `log`" msgstr "не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ \"log\"" @@ -19434,11 +19711,18 @@ msgstr "лог Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ %s неÑподівано завершРmsgid "log for %s is empty" msgstr "лог Ð´Ð»Ñ %s порожній" +msgid "refusing to force and skip creation of reflog" +msgstr "відмовлено в примуÑовому пропуÑку ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ€ÐµÑ„Ð»Ð¾Ð³Ñƒ" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "відмовлено в оновленні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· невірною назвою \"%s\"" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "відмовлено в оновленні пÑевдопоÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\"" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref завершивÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾ Ð´Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": %s" @@ -19469,6 +19753,25 @@ msgid "could not delete references: %s" msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ поÑиланнÑ: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "Закінчено пробну міграцію поÑилань, результат можна знайти в \"%s\"\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "не вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ тимчаÑову директорію міграції \"%s\"" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "перенеÑені поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° знайти в \"%s\"" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"неможливо заблокувати поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\": очікувалоÑÑŒ Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· " +"призначеннÑм \"%s\", але це звичайне поÑиланнÑ" + +#, c-format msgid "refname is dangerous: %s" msgstr "refname Ñ” небезпечним: %s" @@ -20446,7 +20749,7 @@ msgid "" " git rebase --continue\n" msgstr "" "ви маєте індекÑовані зміни у вашому робочому дереві\n" -"Якщо ці зміни мають бути ÑтиÑнуті у попередній коміт, запуÑÑ‚Ñ–Ñ‚ÑŒ:\n" +"Якщо ці зміни мають бути зчавлені у попередній коміт, запуÑÑ‚Ñ–Ñ‚ÑŒ:\n" "\n" " git commit --amend %s\n" "\n" @@ -20657,6 +20960,49 @@ msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "update-ref потребує повної назви поÑиланнÑ, наприклад, refs/heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "\"%s\" не приймає коміти злиттÑ" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"\"pick\" не приймає коміти злиттÑ. Якщо ви хочете\n" +"відтворити злиттÑ, викориÑтовуйте \"merge -C\" Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð°." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"\"reword\" не приймає коміти злиттÑ. Якщо ви хочете\n" +"відтворити Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ‚Ð° змінити текÑÑ‚ допиÑу, викориÑтовуйте\n" +"\"merge -c\" Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð°." + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"\"edit\" не приймає коміти злиттÑ. Якщо ви хочете\n" +"відтворити злиттÑ, викориÑтовуйте \"merge -C\" Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð°, а потім\n" +"\"break\" Ð´Ð»Ñ Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ, щоб ви могли\n" +"виконати \"git commit --amend && git rebase --continue\"." + +msgid "cannot squash merge commit into another commit" +msgstr "неможливо зчавити коміт Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð² інший коміт" + +#, c-format msgid "invalid command '%.*s'" msgstr "неприпуÑтима команда \"%.*s\"" @@ -20774,9 +21120,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "неможливо прочитати HEAD" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "не вдалоÑÑ Ñкопіювати \"%s\" в \"%s\"" +msgid "could not write commit message file" +msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл допиÑу до коміта" #, c-format msgid "" @@ -21180,6 +21525,18 @@ msgstr "неможливо повернутиÑÑ Ð´Ð¾ поточної робо msgid "failed to stat '%*s%s%s'" msgstr "не вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати \"%*s%s%s\"" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"виÑвлено Ñумнівне право влаÑноÑÑ‚Ñ– у Ñховищі за адреÑою \"%s\"\n" +"%sЩоб додати винÑток Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— директорії, виконайте:\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ поточну робочу директорію" @@ -21202,18 +21559,6 @@ msgstr "" "вÑтановлено)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"виÑвлено Ñумнівне право влаÑноÑÑ‚Ñ– у Ñховищі за адреÑою \"%s\"\n" -"%sЩоб додати винÑток Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— директорії, виконайте:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "" "неможливо викориÑтати порожнє Ñховище \"%s\" (safe.bareRepository " @@ -21518,7 +21863,17 @@ msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ підмодуль \"%s\"." #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "підмодуль git dir \"%s\" знаходитьÑÑ Ð²Ñередині git директорії \"%.*s\"" +msgstr "підмодуль git dir \"%s\" знаходитьÑÑ Ð²Ñередині git директорії \"%*s\"" + +#, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"очікувалоÑÑŒ, що \"%.*s\" у шлÑху Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" не буде Ñимвольним " +"поÑиланнÑм" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "очікувалоÑÑŒ, що шлÑÑ… Ð¿Ñ–Ð´Ð¼Ð¾Ð´ÑƒÐ»Ñ \"%s\" не буде Ñимвольним поÑиланнÑм" #, c-format msgid "" @@ -21561,10 +21916,6 @@ msgstr "" "немає налаштованого віддаленого Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ URI пакунків з " "нього" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "віддалений \"%s\" не має налаштованої URL-адреÑи" - msgid "could not get the bundle-uri list" msgstr "не вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÑпиÑок bundle-uri" @@ -23058,24 +23409,24 @@ msgid "Failed to send %s\n" msgstr "Ðе вдалоÑÑ Ð½Ð°Ð´Ñ–Ñлати %s\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Пробно відправлено %s\n" +msgid "Dry-Sent %s" +msgstr "Пробно відправлено %s" #, perl-format -msgid "Sent %s\n" -msgstr "Відправлено %s\n" +msgid "Sent %s" +msgstr "Відправлено %s" -msgid "Dry-OK. Log says:\n" -msgstr "Пробно OK. Журнал каже:\n" +msgid "Dry-OK. Log says:" +msgstr "Пробно OK. Журнал каже:" -msgid "OK. Log says:\n" -msgstr "ОК. Журнал каже:\n" +msgid "OK. Log says:" +msgstr "ОК. Журнал каже:" msgid "Result: " msgstr "Результат: " -msgid "Result: OK\n" -msgstr "Результат: OK\n" +msgid "Result: OK" +msgstr "Результат: OK" #, perl-format msgid "can't open file %s" @@ -2,19 +2,72 @@ # Bản dịch tiếng Việt dà nh cho GIT-CORE. # This file is distributed under the same license as the git-core package. # https://raw.githubusercontent.com/git-l10n/git-po/pot/main/po/git.pot +# --- # Copyright (C) 2012-2022, Translation Project, Vietnamese Team <http://translationproject.org/team/vi.html> # Copyright (C) 2024, VÅ© Tiến HÆ°ng <newcomerminecraft@gmail.com> # Nguyá»…n Thái Ngá»c Duy <pclouds@gmail.com>, 2012. # Äoà n Trần Công Danh <congdanhqx@gmail.com>, 2020. # Trần Ngá»c Quân <vnwildman@gmail.com>, 2012-2022. # VÅ© Tiến HÆ°ng <newcomerminecraft@gmail.com>, 2024. +# --- +# BẢNG THUẬT NGá»® / TERMINOLOGY +# Updated: 2024-07-26, git 2.46 # -msgid "" -msgstr "" -"Project-Id-Version: git 2.45\n" +# Ghi chú: +# - Bảng thuáºt ngữ nà y chÆ°a hoà n thiện. +# - Tuỳ và o ngữ cảnh, bản dịch có thể thay đổi cho phù hợp. +# +# CÃCH VIẾT TẮT +# n. = danh từ +# v. = Ä‘á»™ng từ +# a. = tÃnh từ +# +# +------------------------------------------------------------------+ +# | Thuáºt ngữ / Term | Bản dịch / Translation | +# +------------------------------------------------------------------+ +# | file | táºp tin | +# | folder | thÆ° mục | +# | path | Ä‘Æ°á»ng dẫn | +# | error | lá»—i | +# | fatal / fatal error | lá»—i nghiêm trá»ng | +# | warning | cảnh báo | +# | (v.) commit | chuyển giao | +# | (n.) commit | lần chuyển giao | +# | (n.) branch | nhánh | +# | (v.) branch | tạo nhánh | +# | (n.) log | nháºt ký | +# | (v.) log | ghi lại | +# | (n.) ref/refs | tham chiếu | +# | hunk | khúc | +# | index | chỉ mục | +# | (n.) stage | vùng chá» | +# | (v.) stage <...> | Ä‘Æ°a <...> và o vùng chá» | +# | (v.) unstage <...> | bá» <...> ra khá»i vùng chá» | +# | revert | hoà n nguyên | +# | add | thêm | +# | restore | phục hồi | +# | (n./v.) change | thay đổi | +# | (v.) update | cáºp nháºt | +# | (v.) track | theo dõi | +# | (v.) untrack | bá» theo dõi | +# | (a.) tracked | được theo dõi | +# | (a.) untracked | không được theo dõi | +# | (v.) parse | hiểu cú pháp | +# | (n.) output | đầu ra, kết quả | +# | (v.) output | in ra, xuất ra | +# | (v.) merge | hoà trá»™n | +# | (v.) rebase | cải tổ | +# | (v.) squash | squash | +# | (v.) amend | tu bổ | +# | | | +# | ... TODO ... | | +# +------------------------------------------------------------------+ +msgid "" +msgstr "" +"Project-Id-Version: git 2.46\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-25 18:57+0000\n" -"PO-Revision-Date: 2024-04-28 14:01+0700\n" +"POT-Creation-Date: 2024-07-21 00:11+0700\n" +"PO-Revision-Date: 2024-07-26 11:31+0700\n" "Last-Translator: VÅ© Tiến HÆ°ng <newcomerminecraft@gmail.com>\n" "Language-Team: Vietnamese <https://github.com/Nekosha/git-po>\n" "Language: vi\n" @@ -44,7 +97,7 @@ msgstr "Cáºp nháºt" #, c-format msgid "could not stage '%s'" -msgstr "không thể Ä‘Æ°a '%s' lên bệ phóng" +msgstr "không thể Ä‘Æ°a '%s' và o vùng chá»" msgid "could not write index" msgstr "không thể ghi chỉ mục" @@ -113,7 +166,7 @@ msgstr "" msgid "revert staged set of changes back to the HEAD version" msgstr "" -"hoà n nguyên lại táºp hợp các thay đổi đã được Ä‘Æ°a lên bệ phóng trở lại phiên " +"hoà n nguyên lại táºp hợp các thay đổi đã được Ä‘Æ°a và o vùng chá» trở lại phiên " "bản HEAD" msgid "pick hunks and update selectively" @@ -125,7 +178,7 @@ msgstr "xem khác biệt giữa HEAD và chỉ mục" msgid "add contents of untracked files to the staged set of changes" msgstr "" "thêm ná»™i dung của các táºp tin chÆ°a được theo dõi và o táºp hợp các thay đổi đã " -"được Ä‘Æ°a lên bệ phóng" +"được Ä‘Æ°a và o vùng chá»" msgid "Prompt help:" msgstr "Trợ giúp vá» nhắc:" @@ -164,10 +217,10 @@ msgid "What now" msgstr "Giá» thì sao" msgid "staged" -msgstr "đã Ä‘Æ°a lên bệ phóng" +msgstr "đã Ä‘Æ°a và o vùng chá»" msgid "unstaged" -msgstr "chÆ°a Ä‘Æ°a lên bệ phóng" +msgstr "chÆ°a Ä‘Æ°a và o vùng chá»" msgid "path" msgstr "Ä‘Æ°á»ng-dẫn" @@ -181,26 +234,26 @@ msgstr "Tạm biệt.\n" #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "ÄÆ°a lên bệ phóng thay đổi chế Ä‘á»™ [y,n,q,a,d%s,?]? " +msgstr "ÄÆ°a và o vùng chá» thay đổi chế Ä‘á»™ [y,n,q,a,d%s,?]? " #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "ÄÆ°a lên bệ phóng thao tác xoá [y,n,q,a,d%s,?]? " +msgstr "ÄÆ°a và o vùng chá» thao tác xoá [y,n,q,a,d%s,?]? " #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "ÄÆ°a lên bệ phóng thao tác thêm [y,n,q,a,d%s,?]? " +msgstr "ÄÆ°a và o vùng chá» thao tác thêm [y,n,q,a,d%s,?]? " #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "ÄÆ°a lên bệ phóng khúc nà y [y,n,q,a,d%s,?]? " +msgstr "ÄÆ°a và o vùng chá» khúc nà y [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" "Nếu bản vá được áp dụng hoà n toà n, khúc đã sá»a sẽ ngay láºp tức được đánh dấu " -"để chuyển lên bệ phóng." +"để chuyển và o vùng chá»." msgid "" "y - stage this hunk\n" @@ -209,11 +262,11 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" -"y - Ä‘Æ°a lên bệ phóng khúc nà y\n" -"n - đừng Ä‘Æ°a lên bệ phóng khúc nà y\n" -"q - thoát; đừng Ä‘Æ°a lên bệ phóng khúc nà y hay bất kỳ cái nà o còn lại\n" -"a - Ä‘Æ°a lên bệ phóng khúc nà y và tất cả các khúc sau nà y trong táºp tin\n" -"d - đừng Ä‘Æ°a lên bệ phóng khúc nà y hay bất kỳ cái nà o còn lại trong táºp tin\n" +"y - Ä‘Æ°a và o vùng chá» khúc nà y\n" +"n - đừng Ä‘Æ°a và o vùng chá» khúc nà y\n" +"q - thoát; đừng Ä‘Æ°a và o vùng chá» khúc nà y hay bất kỳ cái nà o còn lại\n" +"a - Ä‘Æ°a và o vùng chá» khúc nà y và tất cả các khúc sau nà y trong táºp tin\n" +"d - đừng Ä‘Æ°a và o vùng chá» khúc nà y hay bất kỳ cái nà o còn lại trong táºp tin\n" #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " @@ -253,26 +306,26 @@ msgstr "" #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Bá» ra khá»i bệ phóng thay đổi chế Ä‘á»™ [y,n,q,a,d%s,?]? " +msgstr "Bá» ra khá»i vùng chá» thay đổi chế Ä‘á»™ [y,n,q,a,d%s,?]? " #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Bá» ra khá»i bệ phóng thao tác xoá [y,n,q,a,d%s,?]? " +msgstr "Bá» ra khá»i vùng chá» thao tác xoá [y,n,q,a,d%s,?]? " #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "Bá» ra khá»i bệ phóng thao tác thêm [y,n,q,a,d%s,?]? " +msgstr "Bá» ra khá»i vùng chá» thao tác thêm [y,n,q,a,d%s,?]? " #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Bá» ra khá»i bệ phóng khúc nà y [y,n,q,a,d%s,?]? " +msgstr "Bá» ra khá»i vùng chá» khúc nà y [y,n,q,a,d%s,?]? " msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" "Nếu bản vá được áp dụng hoà n toà n, khúc đã sá»a sẽ ngay láºp tức được đánh dấu " -"để bá» ra khá»i bệ phóng." +"để bá» ra khá»i vùng chá»." msgid "" "y - unstage this hunk\n" @@ -281,11 +334,11 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" -"y - Ä‘Æ°a ra khá»i bệ phóng khúc nà y\n" -"n - đừng Ä‘Æ°a ra khá»i bệ phóng khúc nà y\n" -"q - thoát; đừng Ä‘Æ°a ra khá»i bệ phóng khúc nà y hay bất kỳ cái nà o còn lại\n" -"a - Ä‘Æ°a ra khá»i bệ phóng khúc nà y và tất cả các khúc sau nà y trong táºp tin\n" -"d - đừng Ä‘Æ°a ra khá»i bệ phóng khúc nà y hay bất kỳ cái nà o còn lại trong táºp " +"y - Ä‘Æ°a ra khá»i vùng chá» khúc nà y\n" +"n - đừng Ä‘Æ°a ra khá»i vùng chá» khúc nà y\n" +"q - thoát; đừng Ä‘Æ°a ra khá»i vùng chá» khúc nà y hay bất kỳ cái nà o còn lại\n" +"a - Ä‘Æ°a ra khá»i vùng chá» khúc nà y và tất cả các khúc sau nà y trong táºp tin\n" +"d - đừng Ä‘Æ°a ra khá»i vùng chá» khúc nà y hay bất kỳ cái nà o còn lại trong táºp " "tin\n" #, c-format @@ -566,6 +619,10 @@ msgstr "" "p - in ra khúc hiện hà nh\n" "? - hiển thị trợ giúp\n" +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "Cần má»™t ký tá»±, nhÆ°ng lại có '%s'" + msgid "No previous hunk" msgstr "Không có khúc kế trÆ°á»›c" @@ -613,9 +670,19 @@ msgstr "Chia nhá» thà nh %d khúc." msgid "Sorry, cannot edit this hunk" msgstr "Không thể sá»a khúc nà y" +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "không hiểu câu lệnh: '%s' ('?' để hiển thị trợ giúp)" + msgid "'git apply' failed" msgstr "'git apply' gặp lá»—i" +msgid "No changes." +msgstr "Không có thay đổi nà o." + +msgid "Only binary files changed." +msgstr "Chỉ có các táºp tin nhị phân thay đổi." + #, c-format msgid "" "\n" @@ -1462,6 +1529,9 @@ msgstr "bá» qua táºp tin gitattributes quá lá»›n '%s'" msgid "ignoring overly large gitattributes blob '%s'" msgstr "bá» qua blob gitattributes quá lá»›n '%s'" +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "không thể dùng --attr-source hoặc GIT_ATTR_SOURCE mà không có kho chứa" + msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "--attr-source hoặc GIT_ATTR_SOURCE sai" @@ -1772,14 +1842,7 @@ msgid "cannot chmod %cx '%s'" msgstr "không thể chmod %cx '%s'" msgid "Unstaged changes after refreshing the index:" -msgstr "ÄÆ°a ra khá»i bệ phóng các thay đổi sau khi là m má»›i lại chỉ mục:" - -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"mục cà i đặt add.interactive.useBuiltin đã không còn!\n" -"Xem mục tin của nó trong 'git help config' để biết chi tiết." +msgstr "ÄÆ°a ra khá»i vùng chá» các thay đổi sau khi là m má»›i lại chỉ mục:" msgid "could not read the index" msgstr "Không thể Ä‘á»c chỉ mục" @@ -2065,8 +2128,8 @@ msgstr "Thân của lần chuyển giao là :" #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -"Ãp dụng? đồng ý [y]/khô[n]g/chỉnh sá»a [e]/hiển thị miếng [v]á/chấp nháºn tất " -"cả [a]: " +"Ãp dụng? đồng ý [y]/không [n]/chỉnh sá»a [e]/hiển thị bản vá [v]/chấp nháºn " +"tất cả [a]: " msgid "unable to write index file" msgstr "không thể ghi táºp tin chỉ mục" @@ -2110,9 +2173,8 @@ msgid "" "already introduced the same changes; you might want to skip this patch." msgstr "" "Không có thay đổi nà o - bạn đã quên sá» dụng lệnh 'git add' à ?\n" -"Nếu ở đây không có gì còn lại stage, tình cá» là có má»™t số thứ khác\n" -"đã sẵn được Ä‘Æ°a và o vá»›i cùng ná»™i dung thay đổi; bạn có lẽ muốn bá» qua miếng " -"vá nà y." +"Nếu ở đây không còn gì để Ä‘Æ°a và o vùng chá», có lẽ má»™t số ngÆ°á»i khác\n" +"đã thêm các thay đổi trong nà y rồi; bạn có lẽ muốn bá» qua bản vá nà y." msgid "" "You still have unmerged paths in your index.\n" @@ -2121,8 +2183,8 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Bạn vẫn có những Ä‘Æ°á»ng dẫn chÆ°a hòa trá»™n trong chỉ mục của bạn.\n" -"Bạn nên 'git add' từng táºp tin vá»›i các xung Ä‘á»™t đã được giải quyết để đánh " -"dấu chúng là thế.\n" +"Bạn nên 'git add' những táºp tin đã giải quyết xung Ä‘á»™t để đánh dấu chúng là " +"đã xong.\n" "Bạn có lẽ muốn chạy 'git rm' trên má»™t táºp tin để chấp nháºn \"được xóa bởi " "há»\" cho nó." @@ -2222,11 +2284,14 @@ msgstr "huá»· thao tác vá nhÆ°ng vẫn giữ HEAD nÆ¡i nó chỉ đến" msgid "show the patch being applied" msgstr "hiển thị bản vá đã được áp dụng rồi" +msgid "try to apply current patch again" +msgstr "thỠáp dụng bản vá hiện hà nh thêm lần nữa" + msgid "record the empty patch as an empty commit" msgstr "ghi lại bản vá trống rá»—ng nhÆ° là má»™t lần chuyển giao trống" msgid "lie about committer date" -msgstr "nói dối vá» ngà y chuyển giao" +msgstr "là m giả ngà y chuyển giao" msgid "use current timestamp for author date" msgstr "dùng dấu thá»i gian hiện tại cho ngà y tác giả" @@ -2277,9 +2342,6 @@ msgstr "git apply [<các tùy chá»n>] [<miếng-vá>...]" msgid "could not redirect output" msgstr "không thể chuyển hÆ°á»›ng đầu ra" -msgid "git archive: Remote with no URL" -msgstr "git archive: Máy chủ không có địa chỉ URL" - msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: cần ACK/NAK, nhÆ°ng lại nháºn được gói flush" @@ -2603,7 +2665,7 @@ msgid "force progress reporting" msgstr "ép buá»™c báo cáo tiến Ä‘á»™ công việc" msgid "show output score for blame entries" -msgstr "hiển thị kết xuất Ä‘iểm số cho các mục tin 'blame'" +msgstr "hiển thị Ä‘iểm số đầu ra cho các mục tin 'blame'" msgid "show original filename (Default: auto)" msgstr "hiển thị tên táºp tin gốc (Mặc định: auto)" @@ -2881,7 +2943,7 @@ msgid "unset the upstream info" msgstr "bỠđặt thông tin thượng nguồn" msgid "use colored output" -msgstr "tô mà u kết xuất" +msgstr "tô mà u đầu ra" msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh 'remote-tracking'" @@ -3175,6 +3237,9 @@ msgstr "Cần má»™t kho chứa để có thể tạo má»™t bundle." msgid "do not show bundle details" msgstr "không hiển thị chi tiết bundle (bó)" +msgid "need a repository to verify a bundle" +msgstr "cần má»™t kho chứa để thẩm tra má»™t bundle" + #, c-format msgid "%s is okay\n" msgstr "%s tốt\n" @@ -3288,7 +3353,7 @@ msgid "Change or optimize batch output" msgstr "Thay đổi hay tối Æ°u hóa đầu ra batch" msgid "buffer --batch output" -msgstr "đệm kết xuất --batch" +msgstr "buffer đầu ra --batch" msgid "follow in-tree symlinks" msgstr "theo liên kết má»m trong-cây" @@ -3456,7 +3521,7 @@ msgid "write the content to temporary files" msgstr "ghi ná»™i dung và o táºp tin tạm" msgid "copy out the files from named stage" -msgstr "sao chép ra các táºp tin từ bệ phóng có tên" +msgstr "sao chép ra các táºp tin từ vùng chá» có tên" msgid "git checkout [<options>] <branch>" msgstr "git checkout [<các tùy chá»n>] <nhánh>" @@ -3550,7 +3615,7 @@ msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -"không thể tiếp tục vá»›i các thay đổi đã được Ä‘Æ°a lên bệ phóng trong các dòng " +"không thể tiếp tục vá»›i các thay đổi đã được Ä‘Æ°a và o vùng chá» trong các dòng " "sau:\n" "%s" @@ -3570,7 +3635,7 @@ msgstr "Äặt lại nhánh '%s'\n" #, c-format msgid "Already on '%s'\n" -msgstr "Äã sẵn sà ng trên '%s'\n" +msgstr "Äã sẵn ở trên '%s'\n" #, c-format msgid "Switched to and reset branch '%s'\n" @@ -4177,12 +4242,20 @@ msgid "failed to unlink '%s'" msgstr "gặp lá»—i khi unlink '%s'" #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "không thể kiểm tra liên kết cứng '%s'" + +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "liên kết cứng '%s' khác vá»›i nguồn" + +#, c-format msgid "failed to create link '%s'" -msgstr "gặp lá»—i khi tạo được liên kết má»m %s" +msgstr "gặp lá»—i khi tạo liên kết má»m %s" #, c-format msgid "failed to copy file to '%s'" -msgstr "gặp lá»—i khi sao chép táºp tin và '%s'" +msgstr "gặp lá»—i khi sao chép táºp tin tá»›i '%s'" #, c-format msgid "failed to iterate over '%s'" @@ -4841,7 +4914,7 @@ msgid "version" msgstr "phiên bản" msgid "machine-readable output" -msgstr "kết xuất dạng máy-có-thể-Ä‘á»c" +msgstr "xuất ra dạng máy-có-thể-Ä‘á»c" msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dà i (mặc định)" @@ -4930,15 +5003,14 @@ msgstr "" msgid "use autosquash formatted message to squash specified commit" msgstr "" -"dùng lá»i nhắn có định dạng tá»± Ä‘á»™ng nén để nén lại các lần chuyển giao đã chỉ " -"ra" +"dùng lá»i nhắn có định dạng autosquash để squash các lần chuyển giao đã chỉ ra" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nháºn tôi là tác giả (được dùng vá»›i tùy chá»n -C/-c/--amend)" msgid "trailer" -msgstr "bá»™ dò vết" +msgstr "trailer" msgid "add custom trailer(s)" msgstr "thêm Ä‘uôi tá»± chá»n" @@ -5029,15 +5101,51 @@ msgstr "" "có bị đầy quá hay hạn nghạch Ä‘Ä©a (quota) bị vượt quá hay không,\n" "và sau đó \"git restore --staged :/\" để khắc phục." -msgid "git config [<options>]" -msgstr "git config [<các tùy chá»n>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<tuỳ-chá»n>] [<tuỳ-chá»n-hiển-thị>] [--includes]" -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "đối số không được thừa nháºn --type, %s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<tuỳ-chá»n>] [<tuỳ-chá»n-hiển-thị>] [--includes] [--all] [--" +"regexp=<biểu-thức-chÃnh-quy>] [--value=<giá-trị>] [--fixed-value] [--" +"default=<giá-trị-mặc-định>] <khoá>" -msgid "only one type at a time" -msgstr "chỉ má»™t kiểu má»™t lần" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<tuỳ-chá»n>] [--type=<kiểu>] [--all] [--value=<giá-trị>] [--" +"fixed-value] <khoá> <giá-trị>" + +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<tuỳ-chá»n>] [--all] [--value=<giá-trị>] [--fixed-value] " +"<khoá> <giá-trị>" + +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<tuỳ-chá»n>] <tên-cÅ©> <tên-má»›i>" + +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<tuỳ-chá»n>] <tên>" + +msgid "git config edit [<file-option>]" +msgstr "git config edit [<tùy-chá»n>]" + +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "" +"git config [<tuỳ-chá»n>] --get-colorbool <tên> [<stdout-là -tty-hay-không>]" + +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<tuỳ-chá»n>] [--type=<kiểu>] [--comment=<chú-thÃch>] [--all] " +"[--value=<giá-trị>] [--fixed-value] <khoá> <giá-trị>" msgid "Config file location" msgstr "Vị trà táºp tin cấu hình" @@ -5063,54 +5171,6 @@ msgstr "blob-id" msgid "read config from given blob object" msgstr "Ä‘á»c cấu hình từ đối tượng blob đã cho" -msgid "Action" -msgstr "Hà nh Ä‘á»™ng" - -msgid "get value: name [value-pattern]" -msgstr "lấy giá trị: tên [value-pattern]" - -msgid "get all values: key [value-pattern]" -msgstr "lấy tất cả giá trị: khóa [value-pattern]" - -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "lấy giá trị cho regexp: name-regex [value-pattern]" - -msgid "get value specific for the URL: section[.var] URL" -msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL" - -msgid "replace all matching variables: name value [value-pattern]" -msgstr "thay thế tất cả các biến khá»›p mẫu: tên giá-trị [value-pattern]" - -msgid "add a new variable: name value" -msgstr "thêm biến má»›i: tên giá-trị" - -msgid "remove a variable: name [value-pattern]" -msgstr "gỡ bá» biến: tên [value-pattern]" - -msgid "remove all matches: name [value-pattern]" -msgstr "gỡ bá» má»i cái khá»›p: tên [value-pattern]" - -msgid "rename section: old-name new-name" -msgstr "đổi tên phần: tên-cÅ© tên-má»›i" - -msgid "remove a section: name" -msgstr "gỡ bá» phần: tên" - -msgid "list all" -msgstr "liệt kê tất" - -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "sá» dụng so sánh bằng chuá»—i khi so sánh các giá trị vá»›i 'value-pattern'" - -msgid "open an editor" -msgstr "mở má»™t trình biên soạn" - -msgid "find the color configured: slot [default]" -msgstr "tìm cấu hình mà u sắc: slot [mặc định]" - -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "tìm các cà i đặt vá» mà u sắc: slot [stdout-là -tty]" - msgid "Type" msgstr "Kiểu" @@ -5138,8 +5198,8 @@ msgstr "giá trị là đưá»ng dẫn (tên táºp tin hay thÆ° mục)" msgid "value is an expiry date" msgstr "giá trị là má»™t ngà y hết hạn" -msgid "Other" -msgstr "Khác" +msgid "Display options" +msgstr "Tuỳ chá»n hiển thị" msgid "terminate values with NUL byte" msgstr "kết thúc giá trị vá»›i byte NUL" @@ -5147,9 +5207,6 @@ msgstr "kết thúc giá trị vá»›i byte NUL" msgid "show variable names only" msgstr "chỉ hiển thị các tên biến" -msgid "respect include directives on lookup" -msgstr "tôn trá»ng kể cà các hÆ°á»›ng trong tìm kiếm" - msgid "show origin of config (file, standard input, blob, command line)" msgstr "hiển thị nguồn gốc của cấu hình (táºp tin, stdin, blob, dòng lệnh)" @@ -5158,14 +5215,15 @@ msgstr "" "hiển thị phạm vi của cấu hình (cây là m việc, cục bá»™, toà n cầu, hệ thống, " "lệnh)" -msgid "value" -msgstr "giá trị" +msgid "show config keys in addition to their values" +msgstr "hiển thị khoá cùng vói giá trị" -msgid "with --get, use default value when missing entry" -msgstr "vá»›i --get, dùng giá trị mặc định khi thiếu mục tin" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "đối số không được thừa nháºn --type, %s" -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "ghi chú cho ngÆ°á»i Ä‘á»c được (tá»± Ä‘á»™ng thêm # và o trÆ°á»›c nếu cần)" +msgid "only one type at a time" +msgstr "chỉ má»™t kiểu má»™t lần" #, c-format msgid "wrong number of arguments, should be %d" @@ -5241,47 +5299,72 @@ msgstr "" "worktreeConfig được báºt. Vui lòng Ä‘á»c phần \"CONFIGURATION FILE\"\n" "trong \"git help worktree\" để biết thêm chi tiết" -msgid "--get-color and variable type are incoherent" -msgstr "--get-color và kiểu biến là không mạch lạc" +msgid "Other" +msgstr "Khác" -msgid "only one action at a time" -msgstr "chỉ má»™t thao tác má»—i lần" +msgid "respect include directives on lookup" +msgstr "tôn trá»ng kể cà các hÆ°á»›ng trong tìm kiếm" -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "không thể Ä‘á»c táºp tin cấu hình '%s'" -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "" -"--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --" -"list" +msgid "error processing config file(s)" +msgstr "gặp lá»—i khi xá» lý các táºp tin cấu hình" -msgid "--default is only applicable to --get" -msgstr "--default chỉ được áp dụng cho --get" +msgid "Filter options" +msgstr "Tùy chá»n lá»c" -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment chỉ được áp dụng cho thao tác add/set/replace" +msgid "return all values for multi-valued config options" +msgstr "trả vá» tất cả giá trị cho tuỳ chá»n cấu hình Ä‘a trị" + +msgid "interpret the name as a regular expression" +msgstr "coi khoá là biểu thức chÃnh quy" + +msgid "show config with values matching the pattern" +msgstr "hiển thị giá trị cấu hình khá»›p vá»›i mẫu" + +msgid "use string equality when comparing values to value pattern" +msgstr "sá» dụng so sánh xâu khi so sánh các giá trị vá»›i mẫu" + +msgid "URL" +msgstr "URL" + +msgid "show config matching the given URL" +msgstr "hiển thị giá trị cấu hình khá»›p vá»›i URL" + +msgid "value" +msgstr "giá trị" + +msgid "use default value when missing entry" +msgstr "dùng giá trị mặc định khi không tồn tại" msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value chỉ áp dụng vá»›i 'value-pattern'" -#, c-format -msgid "unable to read config file '%s'" -msgstr "không thể Ä‘á»c táºp tin cấu hình '%s'" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= không thể được dùng vá»›i --all hay --url" -msgid "error processing config file(s)" -msgstr "gặp lá»—i khi xá» lý các táºp tin cấu hình" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= không thể được dùng vá»›i --all, --regexp hay --value" -msgid "editing stdin is not supported" -msgstr "sá»a chữa stdin là không được há»— trợ" +msgid "Filter" +msgstr "Bá»™ lá»c" -msgid "editing blobs is not supported" -msgstr "việc sá»a chữa các blob là không được há»— trợ" +msgid "replace multi-valued config option with new value" +msgstr "thay thế tuỳ chá»n cấu hình Ä‘a trị thà nh giá trị" -#, c-format -msgid "cannot create configuration file %s" -msgstr "không thể tạo táºp tin cấu hình '%s'" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "ghi chú cho ngÆ°á»i Ä‘á»c được (tá»± Ä‘á»™ng thêm # và o trÆ°á»›c nếu cần)" + +msgid "add a new line without altering any existing values" +msgstr "thêm dòng má»›i giữ nguyên các giá trị cÅ©" + +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value chỉ áp dụng vá»›i --value=<mẫu>" + +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append không thể được dùng vá»›i --value=<mẫu>" #, c-format msgid "" @@ -5295,6 +5378,86 @@ msgstr "" msgid "no such section: %s" msgstr "không có Ä‘oạn: %s" +msgid "editing stdin is not supported" +msgstr "sá»a chữa stdin là không được há»— trợ" + +msgid "editing blobs is not supported" +msgstr "việc sá»a chữa các blob là không được há»— trợ" + +#, c-format +msgid "cannot create configuration file %s" +msgstr "không thể tạo táºp tin cấu hình '%s'" + +msgid "Action" +msgstr "Hà nh Ä‘á»™ng" + +msgid "get value: name [<value-pattern>]" +msgstr "lấy giá trị: khoá [<mẫu-giá-trị>]" + +msgid "get all values: key [<value-pattern>]" +msgstr "lấy tất cả giá trị: khóa [<mẫu-giá-trị>]" + +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "lấy giá trị cho biểu thức chÃnh quy: regex [<mẫu-giá-trị>]" + +msgid "get value specific for the URL: section[.var] URL" +msgstr "lấy giá trị riêng cho URL: phần[.biến] URL" + +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "thay thế tất cả các biến khá»›p mẫu: tên giá-trị [<mẫu-giá-trị>]" + +msgid "add a new variable: name value" +msgstr "thêm biến má»›i: tên giá-trị" + +msgid "remove a variable: name [<value-pattern>]" +msgstr "gỡ bá» biến: tên [<mẫu-giá-trị>]" + +msgid "remove all matches: name [<value-pattern>]" +msgstr "gỡ bá» má»i biến khá»›p: tên [<mẫu-giá-trị>]" + +msgid "rename section: old-name new-name" +msgstr "đổi tên phần: tên-cÅ© tên-má»›i" + +msgid "remove a section: name" +msgstr "gỡ bá» phần: tên" + +msgid "list all" +msgstr "liệt kê tất" + +msgid "open an editor" +msgstr "mở má»™t trình biên soạn" + +msgid "find the color configured: slot [<default>]" +msgstr "tìm cấu hình mà u sắc: slot [<mặc định>]" + +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "tìm các cà i đặt vá» mà u sắc: slot [<stdout-là -tty-hay-không>]" + +msgid "with --get, use default value when missing entry" +msgstr "vá»›i --get, dùng giá trị mặc định khi thiếu mục tin" + +msgid "--get-color and variable type are incoherent" +msgstr "--get-color và kiểu biến là không mạch lạc" + +msgid "no action specified" +msgstr "chÆ°a chỉ ra hà nh Ä‘á»™ng" + +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp" + +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --" +"list" + +msgid "--default is only applicable to --get" +msgstr "--default chỉ được áp dụng cho --get" + +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment chỉ được áp dụng cho thao tác add/set/replace" + msgid "print sizes in human readable format" msgstr "hiển thị kÃch cỡ theo định dạng dà nh cho ngÆ°á»i Ä‘á»c" @@ -5637,7 +5800,7 @@ msgid "use the done feature to terminate the stream" msgstr "sá» dụng tÃnh năng done để kết thúc luồng dữ liệu" msgid "skip output of blob data" -msgstr "bá» qua kết xuất của dữ liệu blob" +msgstr "bá» qua đầu ra của dữ liệu blob" msgid "refspec" msgstr "refspec" @@ -5646,7 +5809,7 @@ msgid "apply refspec to exported refs" msgstr "áp dụng refspec cho refs đã xuất" msgid "anonymize output" -msgstr "kết xuất anonymize" +msgstr "ẩn danh đầu ra" msgid "from:to" msgstr "từ:đến" @@ -5946,7 +6109,7 @@ msgid "re-fetch without negotiating common commits" msgstr "re-fetch mà không dà n xếp các lần chuyển giao chung" msgid "prepend this to submodule path output" -msgstr "soạn sẵn cái nà y cho kết xuất Ä‘Æ°á»ng dẫn mô-Ä‘un-con" +msgstr "soạn sẵn cái nà y cho đầu ra Ä‘Æ°á»ng dẫn mô-Ä‘un-con" msgid "" "default for recursive fetching of submodules (lower priority than config " @@ -6038,7 +6201,7 @@ msgid "populate log with at most <n> entries from shortlog" msgstr "gắn nháºt ký vá»›i Ãt nhất <n> mục từ lệnh 'shortlog'" msgid "alias for --log (deprecated)" -msgstr "bà danh cho --log (đã lạc háºu)" +msgstr "đồng nghÄ©a vá»›i --log (đã không còn)" msgid "text" msgstr "văn bản" @@ -6119,6 +6282,9 @@ msgstr "config" msgid "config key storing a list of repository paths" msgstr "khóa cấu hình lÆ°u trữ danh sách Ä‘Æ°á»ng dẫn kho lÆ°u trữ" +msgid "keep going even if command fails in a repository" +msgstr "tiếp tục dù có lệnh thất bại trong kho chứa" + msgid "missing --config=<config>" msgstr "thiếu --config=<config>" @@ -6141,7 +6307,7 @@ msgstr "có cảnh báo trong %s %s: %s" #, c-format msgid "broken link from %7s %s" -msgstr "liên kết gãy từ %7s %s" +msgstr "liên kết há»ng từ %7s %s" msgid "wrong object type in link" msgstr "kiểu đối tượng sai trong liên kết" @@ -6151,7 +6317,7 @@ msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -"liên kết gãy từ %7s %s \n" +"liên kết há»ng từ %7s %s \n" " tá»›i %7s %s" msgid "Checking connectivity" @@ -6858,7 +7024,7 @@ msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra vá»›i tùy chá»n -e" msgid "indicate hit with exit status without output" -msgstr "Ä‘Æ°a ra gợi ý vá»›i trạng thái thoát mà không có kết xuất" +msgstr "chỉ ra có khá»›p mẫu hay không vá»›i trạng thái thoát thay vì đầu ra" msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khá»›p từ táºp tin mà nó khá»›p toà n bá»™ các mẫu" @@ -7402,7 +7568,7 @@ msgid "invalid --decorate option: %s" msgstr "tùy chá»n --decorate không hợp lệ: %s" msgid "suppress diff output" -msgstr "chặn má»i kết xuất từ diff" +msgstr "chặn má»i đầu ra từ diff" msgid "show source" msgstr "hiển thị mã nguồn" @@ -7435,7 +7601,7 @@ msgstr "-L<vùng>:<táºp tin> không thể được sá» dụng vá»›i đặc tẠ#, c-format msgid "Final output: %d %s\n" -msgstr "Kết xuất cuối cùng: %d %s\n" +msgstr "Äầu ra cuối cùng: %d %s\n" msgid "unable to create temporary object directory" msgstr "không thể tạo thÆ° mục đối tượng tạm thá»i" @@ -7487,7 +7653,7 @@ msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các tùy chá»n>] [<kể-từ> | <vùng-xem-xét>]" msgid "two output directories?" -msgstr "hai thÆ° mục kết xuất?" +msgstr "hai thÆ° mục đầu ra?" #, c-format msgid "unknown commit %s" @@ -7563,8 +7729,11 @@ msgstr "đánh dấu chuá»—i là lần chạy lại thứ N" msgid "max length of output filename" msgstr "chiá»u dà i tên táºp tin đầu ra tối Ä‘a" -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "dùng [RFC PATCH] thay cho [PATCH]" +msgid "rfc" +msgstr "rfc" + +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "thêm <rfc> (mặc định 'RFC') trÆ°á»›c 'PATCH'" msgid "cover-from-description-mode" msgstr "cover-from-description-mode" @@ -7585,7 +7754,7 @@ msgid "don't strip/add [PATCH]" msgstr "không loại bá»/thêm [PATCH]" msgid "don't output binary diffs" -msgstr "không kết xuất diff nhị phân" +msgstr "không xuất diff nhị phân" msgid "output all-zero hash in From header" msgstr "xuất má»i mã băm all-zero trong phần đầu From" @@ -7722,7 +7891,7 @@ msgid "Generating patches" msgstr "Äang tạo các bản vá" msgid "failed to create output files" -msgstr "gặp lá»—i khi tạo các táºp tin kết xuất" +msgstr "gặp lá»—i khi tạo các táºp tin đầu ra" msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giá»›i-hạn>]]]" @@ -7759,19 +7928,19 @@ msgid "show cached files in the output (default)" msgstr "hiển thị các táºp tin được nhá»› tạm và o đầu ra (mặc định)" msgid "show deleted files in the output" -msgstr "hiển thị các táºp tin đã xóa trong kết xuất" +msgstr "hiển thị các táºp tin đã xóa trong đầu ra" msgid "show modified files in the output" -msgstr "hiển thị các táºp tin đã bị sá»a đổi ra kết xuất" +msgstr "hiển thị các táºp tin đã bị sá»a đổi ra đầu ra" msgid "show other files in the output" -msgstr "hiển thị các táºp tin khác trong kết xuất" +msgstr "hiển thị các táºp tin khác trong đầu ra" msgid "show ignored files in the output" -msgstr "hiển thị các táºp tin bị bá» qua trong kết xuất" +msgstr "hiển thị các táºp tin bị bá» qua trong đầu ra" msgid "show staged contents' object name in the output" -msgstr "hiển thị tên đối tượng của ná»™i dung được đặt lên bệ phóng ra kết xuất" +msgstr "hiển thị tên đối tượng của ná»™i dung được đặt và o vùng chá» ra đầu ra" msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các táºp tin trên hệ thống táºp tin mà nó cần được gỡ bá»" @@ -7786,13 +7955,13 @@ msgid "don't show empty directories" msgstr "không hiển thị thÆ° mục rá»—ng" msgid "show unmerged files in the output" -msgstr "hiển thị các táºp tin chÆ°a hòa trá»™n trong kết xuất" +msgstr "hiển thị các táºp tin chÆ°a hòa trá»™n trong đầu ra" msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" msgid "skip files matching pattern" -msgstr "bá» qua những táºp tin khá»›p vá»›i má»™t mẫu" +msgstr "bá» qua những táºp tin khá»›p vá»›i mẫu" msgid "read exclude patterns from <file>" msgstr "Ä‘á»c mẫu cần loại trừ từ <táºp-tin>" @@ -7804,10 +7973,10 @@ msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" msgid "make the output relative to the project top directory" -msgstr "là m cho kết xuất liên quan đến thÆ° mục ở mức cao nhất (gốc) của dá»± án" +msgstr "cho kết quả là đưá»ng dẫn tÆ°Æ¡ng đối từ thÆ° mục gốc của dá»± án" msgid "if any <file> is not in the index, treat this as an error" -msgstr "nếu <táºp tin> bất kỳ không ở trong chỉ mục, xá» lý nó nhÆ° má»™t lá»—i" +msgstr "nếu có bất kỳ <táºp tin> không ở trong chỉ mục, coi nó nhÆ° má»™t lá»—i" msgid "tree-ish" msgstr "tree-ish" @@ -7833,11 +8002,11 @@ msgstr "" "deduplicate, --eol" msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<kho> [<mẫu>...]]" @@ -7853,8 +8022,11 @@ msgstr "Ä‘Æ°á»ng dẫn của git-upload-pack trên máy chủ" msgid "limit to tags" msgstr "giá»›i hạn tá»›i các thẻ" -msgid "limit to heads" -msgstr "giá»›i hạn cho các đầu" +msgid "limit to branches" +msgstr "giá»›i hạn tá»›i các nhánh" + +msgid "deprecated synonym for --branches" +msgstr "trÆ°á»›c đây là đồng nghÄ©a vá»›i --branches" msgid "do not show peeled tags" msgstr "không hiển thị thẻ bị peel (gá»t bá»)" @@ -8694,7 +8866,7 @@ msgid "Write/edit the notes for the following object:" msgstr "Ghi hay sá»a ghi chú cho đối tượng sau đây:" msgid "could not read 'show' output" -msgstr "không thể Ä‘á»c kết xuất 'show'" +msgstr "không thể Ä‘á»c đầu ra 'show'" #, c-format msgid "failed to finish 'show' for object '%s'" @@ -9171,7 +9343,7 @@ msgid "use threads when searching for best delta matches" msgstr "sá» dụng các tuyến trình khi tìm kiếm cho các mẫu khá»›p delta tốt nhất" msgid "do not create an empty pack output" -msgstr "không thể tạo kết xuất gói trống rá»—ng" +msgstr "không thể tạo đầu ra gói trống rá»—ng" msgid "read revision arguments from standard input" msgstr "Ä‘á»c tham số 'revision' từ stdin" @@ -9300,7 +9472,7 @@ msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" "reused %<PRIu32> (from %<PRIuMAX>)" msgstr "" -"Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>),dùng " +"Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), dùng " "lại pack %<PRIu32> (trong số %<PRIuMAX>)" msgid "" @@ -9862,10 +10034,10 @@ msgid "passed to 'git log'" msgstr "chuyển cho 'git log'" msgid "only emit output related to the first range" -msgstr "chỉ phát ra kết xuất liên quan đến vùng đầu tiên" +msgstr "chỉ phát ra kết quả liên quan đến vùng đầu tiên" msgid "only emit output related to the second range" -msgstr "chỉ phát ra kết xuất liên quan đến vùng thứ hai" +msgstr "chỉ phát ra kết quả liên quan đến vùng thứ hai" #, c-format msgid "not a revision: '%s'" @@ -10029,7 +10201,7 @@ msgstr "" "không thể tổ hợp các tùy chá»n áp dụng vá»›i các tùy chá»n hòa trá»™n vá»›i nhau" msgid "--empty=ask is deprecated; use '--empty=stop' instead." -msgstr "không cho dùng --empty=ask nữa; hãy thay thế bằng '--empty=stop'." +msgstr "không còn dùng --empty=ask nữa; hãy thay thế bằng '--empty=stop'." #, c-format msgid "" @@ -10499,6 +10671,22 @@ msgstr "chÆ°a chỉ ra reflog để xóa" msgid "invalid ref format: %s" msgstr "định dạng tham chiếu không hợp lệ: %s" +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<định dạng> [--dry-run]" + +msgid "specify the reference format to convert to" +msgstr "chỉ định định dạng tham chiếu để chuyển đổi sang" + +msgid "perform a non-destructive dry-run" +msgstr "chạy thá» mà không thay đổi gì" + +msgid "missing --ref-format=<format>" +msgstr "thiếu --ref-format=<định dạng>" + +#, c-format +msgid "repository already uses '%s' format" +msgstr "kho đã dùng định dạng '%s'" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -10778,9 +10966,6 @@ msgstr "* máy chủ %s" msgid " Fetch URL: %s" msgstr " URL để lấy vá»: %s" -msgid "(no URL)" -msgstr "(không có URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -10789,6 +10974,9 @@ msgstr "(không có URL)" msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" +msgid "(no URL)" +msgstr "(không có URL)" + #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" @@ -10891,10 +11079,6 @@ msgstr "truy vấn đẩy URL thay vì lấy" msgid "return all URLs" msgstr "trả vá» má»i URL" -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "không có URL nà o được cấu hình cho nhánh '%s'" - msgid "manipulate push URLs" msgstr "đẩy các 'URL' bằng tay" @@ -11260,7 +11444,7 @@ msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file không nháºn đối số" msgid "only one pattern can be given with -l" -msgstr "chỉ má»™t mẫu được chỉ ra vá»›i tùy chá»n -l" +msgstr "chỉ được chỉ định má»™t mẫu cùng vá»›i tùy chá»n -l" msgid "need some commits to replay" msgstr "cần các chuyển giao để phát lại" @@ -11422,7 +11606,7 @@ msgstr "Gặp lá»—i khi phân giải '%s' nhÆ° là má»™t cây (tree) hợp lệ. msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"không cho dùng --mixed vá»›i các Ä‘Æ°á»ng dẫn nữa; hãy thay thế bằng lệnh 'git " +"không còn dùng --mixed vá»›i các Ä‘Æ°á»ng dẫn nữa; hãy thay thế bằng lệnh 'git " "reset -- </các/Ä‘Æ°á»ng/dẫn>'." #, c-format @@ -11434,7 +11618,7 @@ msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho chứa bare" msgid "Unstaged changes after reset:" -msgstr "Những thay đổi được Ä‘Æ°a ra khá»i bệ phóng sau khi reset:" +msgstr "Những thay đổi được Ä‘Æ°a ra khá»i vùng chá» sau khi reset:" #, c-format msgid "" @@ -11477,7 +11661,7 @@ msgid "stop parsing after the first non-option argument" msgstr "dừng Ä‘á»c sau đối số đầu tiên không có tùy chá»n" msgid "output in stuck long form" -msgstr "kết xuất trong định dạng gáºy dà i" +msgstr "kết quả có định dạng dà i" msgid "premature end of input" msgstr "đầu và o kết thúc bất thÆ°á»ng" @@ -11646,7 +11830,7 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" -"các táºp tin sau đây có khác biệt ná»™i dung đã Ä‘Æ°a lên bệ phóng\n" +"các táºp tin sau đây có khác biệt ná»™i dung đã Ä‘Æ°a và o vùng chá»\n" "từ cả táºp tin và cả HEAD:" msgid "" @@ -11751,7 +11935,7 @@ msgid "group by committer rather than author" msgstr "nhóm theo ngÆ°á»i chuyển giao thay vì tác giả" msgid "sort output according to the number of commits per author" -msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên má»—i tác giả" +msgstr "sắp xếp kết quả theo số lượng chuyển giao trên má»—i tác giả" msgid "suppress commit descriptions, only provides commit count" msgstr "chặn má»i mô tả lần chuyển giao, chỉ Ä‘Æ°a ra số lượng lần chuyển giao" @@ -11883,12 +12067,12 @@ msgstr "Không hiểu thuáºt toán băm dữ liệu" msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<mẫu>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<mẫu>...]" msgid "" "git show-ref --verify [-q | --quiet] [-d | --dereference]\n" @@ -11911,10 +12095,10 @@ msgstr "tham chiếu không tồn tại" msgid "failed to look up reference" msgstr "gặp lá»—i khi tìm tham chiếu" -msgid "only show tags (can be combined with heads)" -msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng vá»›i đầu)" +msgid "only show tags (can be combined with branches)" +msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng vá»›i nhánh)" -msgid "only show heads (can be combined with tags)" +msgid "only show branches (can be combined with tags)" msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng vá»›i thẻ)" msgid "check for reference existence without resolving" @@ -12229,7 +12413,7 @@ msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" cần má»™t đối số <lần chuyển giao>" msgid "No staged changes" -msgstr "Không có thay đổi đã được Ä‘Æ°a lên bệ phóng" +msgstr "Không có thay đổi đã được Ä‘Æ°a và o vùng chá»" msgid "No changes selected" msgstr "ChÆ°a có thay đổi nà o được chá»n" @@ -12247,7 +12431,7 @@ msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-là m-việc hiện hà nh" msgid "Cannot save the current staged state" -msgstr "Không thể ghi lại trạng thái bệ phóng hiện hà nh" +msgstr "Không thể ghi lại trạng thái vùng chá» hiện hà nh" msgid "Cannot record working tree state" msgstr "Không thể ghi lại trạng thái cây là m việc hiện hà nh" @@ -12281,7 +12465,7 @@ msgid "keep index" msgstr "giữ nguyên chỉ mục" msgid "stash staged changes only" -msgstr "chỉ tạm cất Ä‘i các thay đổi đã Ä‘Æ°a lên bệ phóng" +msgstr "chỉ tạm cất Ä‘i các thay đổi đã Ä‘Æ°a và o vùng chá»" msgid "stash in patch mode" msgstr "cất Ä‘i ở chế Ä‘á»™ vá" @@ -12344,7 +12528,7 @@ msgstr "" "." msgid "suppress output of entering each submodule command" -msgstr "chặn kết xuất của từng lệnh mô-Ä‘un-con" +msgstr "chặn đầu ra của từng lệnh mô-Ä‘un-con" msgid "recurse into nested submodules" msgstr "đệ quy và o trong mô-Ä‘un-con lồng nhau" @@ -12369,7 +12553,7 @@ msgid "Failed to register update mode for submodule path '%s'" msgstr "Gặp lá»—i khi đăng ký chế Ä‘á»™ cáºp nháºt cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con '%s'" msgid "suppress output for initializing a submodule" -msgstr "chặn kết xuất của khởi tạo má»™t mô-Ä‘un-con" +msgstr "chặn đầu ra của khởi tạo má»™t mô-Ä‘un-con" msgid "git submodule init [<options>] [<path>]" msgstr "git submodule init [<các tùy chá»n>] [</Ä‘Æ°á»ng/dẫn>]" @@ -12389,7 +12573,7 @@ msgid "failed to recurse into submodule '%s'" msgstr "gặp lá»—i khi đệ quy và o trong mô-Ä‘un-con '%s'" msgid "suppress submodule status output" -msgstr "chặn kết xuất vá» tình trạng mô-Ä‘un-con" +msgstr "chặn đầu ra vá» tình trạng mô-Ä‘un-con" msgid "" "use commit stored in the index instead of the one stored in the submodule " @@ -12458,7 +12642,7 @@ msgid "failed to update remote for submodule '%s'" msgstr "gặp lá»—i khi cáºp nháºt cho mô-Ä‘un-con '%s'" msgid "suppress output of synchronizing submodule url" -msgstr "chặn kết xuất của url mô-Ä‘un-con đồng bá»™" +msgstr "chặn đầu ra của url mô-Ä‘un-con đồng bá»™" msgid "git submodule sync [--quiet] [--recursive] [<path>]" msgstr "git submodule sync [--quiet] [--recursive] [</Ä‘Æ°á»ng/dẫn>]" @@ -12545,14 +12729,14 @@ msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "từ chối tạo/dùng '%s' trong má»™t thÆ° mục git của mô Ä‘un con" #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "việc sao '%s' và o Ä‘Æ°á»ng dẫn mô-Ä‘un-con '%s' gặp lá»—i" - -#, c-format msgid "directory not empty: '%s'" msgstr "thÆ° mục không trống: '%s'" #, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "việc sao '%s' và o Ä‘Æ°á»ng dẫn mô-Ä‘un-con '%s' gặp lá»—i" + +#, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thÆ° mục mô-Ä‘un-con cho '%s'" @@ -12902,7 +13086,7 @@ msgid "delete symbolic ref" msgstr "xóa tham chiếu má»m" msgid "shorten ref output" -msgstr "là m ngắn kết xuất ref (tham chiếu)" +msgstr "là m ngắn kết quả ref (tham chiếu)" msgid "recursively dereference (default)" msgstr "chế Ä‘á»™ giải tham chiếu đệ quy (mặc định)" @@ -12915,9 +13099,11 @@ msgstr "lý do cáºp nháºt" msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <táºp-tin>] [-e]\n" +" [(--trailer <token>[(=|:)<giá-trị>])...]\n" " <tên-thẻ> [<lần chuyển giao> | <đối tượng> ]" msgid "git tag -d <tagname>..." @@ -13353,7 +13539,7 @@ msgid "print commit contents" msgstr "hiển thị ná»™i dung của lần chuyển giao" msgid "print raw gpg status output" -msgstr "in kết xuất trạng thái gpg dạng thô" +msgstr "in đầu ra trạng thái gpg dạng thô" msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <gói>.idx..." @@ -13764,9 +13950,6 @@ msgstr "phần đầu không được thừa nháºn: %s%s (%d)" msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết nà y:" -msgid "need a repository to verify a bundle" -msgstr "cần má»™t kho chứa để thẩm tra má»™t bundle" - msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -14029,7 +14212,7 @@ msgstr "" "Rút trÃch mã số lần chuyển giao từ má»™t kho nén đã được tạo bởi git-archive" msgid "Print lines matching a pattern" -msgstr "In ra những dòng khá»›p vá»›i má»™t mẫu" +msgstr "In ra những dòng khá»›p vá»›i mẫu" msgid "A portable graphical interface to Git" msgstr "Má»™t giao diện đồ há»a khả chuyển cho Git" @@ -14174,6 +14357,9 @@ msgstr "Nháºn cái mà được đẩy và o trong kho" msgid "Manage reflog information" msgstr "Quản lý thông tin reflog" +msgid "Low-level access to refs" +msgstr "Truy cáºp tá»›i tham chiếu ở mức thấp" + msgid "Manage set of tracked repositories" msgstr "Quản lý táºp hợp các kho chứa đã được theo dõi" @@ -14219,16 +14405,16 @@ msgid "Push objects over Git protocol to another repository" msgstr "Äẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác" msgid "Git's i18n setup code for shell scripts" -msgstr "Mã cà i đặt quốc tế hóa của Git cho văn lệnh hệ vá»" +msgstr "Mã cà i đặt quốc tế hóa của Git cho shell script" msgid "Common Git shell script setup code" -msgstr "Mã cà i đặt văn lệnh hệ vá» Git chung" +msgstr "Mã cà i đặt shell script Git chung" msgid "Restricted login shell for Git-only SSH access" -msgstr "Hệ vỠđăng nháºp có hạn chế cho truy cáºp SSH chỉ-Git" +msgstr "Shell đăng nháºp có hạn chế cho truy cáºp SSH chỉ-Git" msgid "Summarize 'git log' output" -msgstr "Kết xuất 'git log' dạng tóm tắt" +msgstr "Tóm tắt kết quả 'git log'" msgid "Show various types of objects" msgstr "Hiển thị các kiểu khác nhau của các đối tượng" @@ -14248,7 +14434,7 @@ msgstr "" "dõi" msgid "Add file contents to the staging area" -msgstr "Thêm ná»™i dung táºp tin và o vùng bệ phóng" +msgstr "Thêm ná»™i dung táºp tin và o vùng vùng chá»" msgid "Stash the changes in a dirty working directory away" msgstr "Tạm cất Ä‘i các thay đổi trong má»™t thÆ° mục là m việc bẩn" @@ -14266,7 +14452,7 @@ msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Thao tác hai hÆ°á»›ng giữ hai kho Subversion và Git" msgid "Switch branches" -msgstr "Các nhánh chuyển" +msgstr "Chuyển sang nhánh khác" msgid "Read, modify and delete symbolic refs" msgstr "Äá»c, sá»a và xóa tham chiếu má»m" @@ -14335,7 +14521,7 @@ msgid "Git for CVS users" msgstr "Git dà nh cho những ngÆ°á»i dùng CVS" msgid "Tweaking diff output" -msgstr "Chỉnh kết xuất diff" +msgstr "Tinh chỉnh đầu ra diff" msgid "A useful minimum set of commands for Everyday Git" msgstr "Táºp hợp lệnh hữu dụng tối thiểu để dùng Git hà ng ngà y" @@ -14478,6 +14664,14 @@ msgstr "đồ-thị-chuyển-giao thiếu chunk OID lookup cần thiết hoặc msgid "commit-graph required commit data chunk missing or corrupted" msgstr "đồ-thị-chuyển-giao thiếu chunk commit data cần thiết hoặc bị há»ng" +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "" +"vô hiệu hoá bá»™ lá»c Bloom cho đồ thị chuyển giao '%s' do tuỳ chá»n không tÆ°Æ¡ng " +"thÃch" + msgid "commit-graph has no base graphs chunk" msgstr "đồ thị chuyển giao không có chunk đồ thị cÆ¡ sở" @@ -14604,8 +14798,15 @@ msgstr "Äang hòa trá»™n đồ-thị-chuyển-giao" msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -"cố gắng để ghi má»™t đồ thị các lần chuyển giao, nhÆ°ng 'core.commitGraph' bị " -"vô hiệu hóa" +"Ä‘ang thá» ghi đồ thị chuyển giao, nhÆ°ng 'core.commitGraph' bị vô hiệu hóa" + +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "" +"Ä‘ang thá» ghi đồ thị chuyển giao, nhÆ°ng 'commitGraph.changedPathsVersion' " +"(%d) không được há»— trợ" msgid "too many commits to write graph" msgstr "có quá nhiá»u lần chuyển giao để ghi đồ thị" @@ -15765,7 +15966,7 @@ msgid "bad --word-diff argument: %s" msgstr "đối số --word-diff sai: %s" msgid "Diff output format options" -msgstr "Các tùy chá»n định dạng khi xuất các khác biệt" +msgstr "Các tùy chá»n định dạng kết quả khác biệt" msgid "generate patch" msgstr "tạo bản vá" @@ -15789,14 +15990,14 @@ msgid "machine friendly --stat" msgstr "--stat thuáºn tiện cho máy Ä‘á»c" msgid "output only the last line of --stat" -msgstr "chỉ xuất những dòng cuối của --stat" +msgstr "chỉ in ra những dòng cuối của --stat" msgid "<param1>,<param2>..." msgstr "<tham_số_1>,<tham_số_2>..." msgid "" "output the distribution of relative amount of changes for each sub-directory" -msgstr "đầu ra phân phối của số lượng thay đổi tÆ°Æ¡ng đối cho má»—i thÆ° mục con" +msgstr "in ra phân phối số lượng thay đổi tÆ°Æ¡ng đối cho má»—i thÆ° mục con" msgid "synonym for --dirstat=cumulative" msgstr "đồng nghÄ©a vá»›i --dirstat=cumulative" @@ -15845,7 +16046,7 @@ msgid "generate compact summary in diffstat" msgstr "tạo tổng hợp xúc tÃch trong diffstat" msgid "output a binary diff that can be applied" -msgstr "xuất ra má»™t khác biệt dạng nhị phân cái mà có thể được áp dụng" +msgstr "in ra má»™t khác biệt dạng nhị phân có thể được áp dụng" msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" @@ -15882,7 +16083,7 @@ msgid "show the given destination prefix instead of \"b/\"" msgstr "hiển thị tiá»n tố Ä‘Ãch đã cho thay cho \"b/\"" msgid "prepend an additional prefix to every line of output" -msgstr "treo và o trÆ°á»›c má»™t tiá»n tố bổ sung cho má»—i dòng kết xuất" +msgstr "thêm và o trÆ°á»›c má»™t tiá»n tố bổ sung cho má»—i dòng đầu ra" msgid "do not show any source or destination prefix" msgstr "đừng hiển thị bất kỳ tiá»n tố nguồn hay Ä‘Ãch" @@ -16023,7 +16224,7 @@ msgid "exit with 1 if there were differences, 0 otherwise" msgstr "thoát vá»›i mã 1 nếu không có khác biệt gì, 0 nếu ngược lại" msgid "disable all output of the program" -msgstr "tắt má»i kết xuất của chÆ°Æ¡ng trình" +msgstr "tắt má»i đầu ra của chÆ°Æ¡ng trình" msgid "allow an external diff helper to be executed" msgstr "cho phép má»™ helper xuất khác biệt ở bên ngoà i được phép thá»±c thi" @@ -16075,7 +16276,7 @@ msgid "treat <string> in -S as extended POSIX regular expression" msgstr "coi <chuá»—i> trong -S là biểu thức chÃnh quy POSIX mở rá»™ng" msgid "control the order in which files appear in the output" -msgstr "Ä‘iá»u khiển thứ tá»± xuất hiện các táºp tin trong đầu ra" +msgstr "Ä‘iá»u khiển thứ tá»± xuất hiện các táºp tin trong kết quả" msgid "<path>" msgstr "<Ä‘Æ°á»ng-dẫn>" @@ -16084,7 +16285,7 @@ msgid "show the change in the specified path first" msgstr "hiển thị các thay đổi trong Ä‘Æ°á»ng dẫn đã cho ở đầu" msgid "skip the output to the specified path" -msgstr "bá» qua đầu ra vá»›i Ä‘Æ°á»ng dẫn đã cho" +msgstr "bá» qua kết quả vá»›i Ä‘Æ°á»ng dẫn đã cho" msgid "<object-id>" msgstr "<mã-số-đối-tượng>" @@ -16284,7 +16485,7 @@ msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: không thể rẽ nhánh %s" msgid "fetch-pack: invalid index-pack output" -msgstr "fetch-pack: kết xuất index-pack không hợp lệ" +msgstr "fetch-pack: đầu ra index-pack không hợp lệ" #, c-format msgid "%s failed" @@ -16441,19 +16642,23 @@ msgstr "" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C </Ä‘Æ°á»ng/dẫn/>] [-c <tên>=<giá trị>]\n" " [--exec-path[=</Ä‘Æ°á»ng/dẫn/>]] [--html-path] [--man-path] [--info-" "path]\n" -" [-p | --paginate | -P --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=</Ä‘Æ°á»ng/dẫn/>] [--work-tree=</Ä‘Æ°á»ng/dẫn/>] [--" -"namespace=<tên>]\n" -" [--config-env=<tên>=<envvar>] <lệnh> [<các tham số>]" +" [-p | --paginate | -P --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=</Ä‘Æ°á»ng/" +"dẫn/>]\n" +" [--work-tree=</Ä‘Æ°á»ng/dẫn/>] [--namespace=<tên>] [--config-" +"env=<tên>=<envvar>]\n" +" <lệnh> [<các tham số>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16780,16 +16985,16 @@ msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -"Móc '%s' bị bá» qua bởi vì nó không thể đặt là thá»±c thi được.\n" +"Móc '%s' bị bá» qua bởi vì nó không có cá» thá»±c thi được.\n" "Bạn có thể tắt cảnh báo nà y bằng 'git config advice.ignoredHook false'." +msgid "not a git repository" +msgstr "không phải là kho git" + #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "tham số cho --packfile phải là má»™t giá trị băm hợp lệ (có '%s')" -msgid "not a git repository" -msgstr "không phải là kho git" - #, c-format msgid "negative value for http.postBuffer; defaulting to %d" msgstr "giá trị âm cho http.postBuffer; đặt thà nh mặc định là %d" @@ -16800,6 +17005,9 @@ msgstr "Äiá»u khiển giao quyá»n không được há»— trợ vá»›i cURL < 7.2 msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "Chốt khóa công không được há»— trợ vá»›i cURL < 7.39.0" +msgid "Unknown value for http.proactiveauth" +msgstr "không hiểu giá trị cho http.proactiveauth" + msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE không được há»— trợ vá»›i cURL < 7.44.0" @@ -16819,6 +17027,12 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Không thể đặt ứng dụng chạy sau SSL cho '%s': đã đặt rồi" +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "từ chối Ä‘á»c cookie từ http.cookiefile '-'" + +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "bá» qua tuỳ chá»n http.savecookies vì http.cookiefile để trống" + #, c-format msgid "" "unable to update url base from redirection:\n" @@ -16992,8 +17206,8 @@ msgid "Failed to merge submodule %s (commits not present)" msgstr "Gặp lá»—i khi hòa trá»™n mô-Ä‘un-con %s (lần chuyển giao không hiện diện)" #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "Gặp lá»—i khi hòa trá»™n mô-Ä‘un-con %s (kho chứa há»ng)" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "lá»—i: gặp lá»—i khi hòa trá»™n mô-Ä‘un-con %s (kho chứa há»ng)" #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" @@ -17022,12 +17236,13 @@ msgstr "" "Gặp lá»—i khi hòa trá»™n mô-Ä‘un-con %s, nhÆ°ng có nhiá»u cách giải quyết:\n" "%s" -msgid "failed to execute internal merge" -msgstr "Gặp lá»—i khi thá»±c hiện trá»™n ná»™i bá»™" +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "lá»—i: Gặp lá»—i khi thá»±c hiện trá»™n ná»™i bá»™ %s" #, c-format -msgid "unable to add %s to database" -msgstr "Không thể thêm %s và o cÆ¡ sở dữ liệu" +msgid "error: unable to add %s to database" +msgstr "lá»—i: không thể thêm %s và o cÆ¡ sở dữ liệu" #, c-format msgid "Auto-merging %s" @@ -17120,20 +17335,20 @@ msgstr "" "XUNG ÄỘT (đổi-tên/xóa): Äổi tên %s->%s trong %s, nhÆ°ng lại bị xóa trong %s." #, c-format -msgid "cannot read object %s" -msgstr "không thể Ä‘á»c đối tượng %s" +msgid "error: cannot read object %s" +msgstr "lá»—i: không thể Ä‘á»c đối tượng %s" #, c-format -msgid "object %s is not a blob" -msgstr "đối tượng %s không phải là má»™t blob" +msgid "error: object %s is not a blob" +msgstr "lá»—i: đối tượng %s không phải là má»™t blob" #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -"XUNG ÄỘT (táºp tin/thÆ° mục): thÆ° mục theo cách của %s từ %s; thay và o đó, di " -"chuyển nó đến %s." +"XUNG ÄỘT (táºp tin/thÆ° mục): thÆ° mục khác nằm trên %s từ %s; thay và o đó sẽ " +"di chuyển nó đến %s." #, c-format msgid "" @@ -17141,15 +17356,15 @@ msgid "" "of them so each can be recorded somewhere." msgstr "" "XUNG ÄỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở má»—i bên; đã đổi " -"tên cả hai trong số chúng để má»—i cái có thể được ghi lại ở đâu đó." +"tên cả hai để có thể ghi lại cả hai." #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" -"XUNG ÄỘT (các kiểu riêng biệt): %s có các loại khác nhau ở má»—i bên; đã đổi " -"tên má»™t trong số chúng để má»—i cái có thể được ghi lại ở đâu đó." +"XUNG ÄỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở má»—i bên; đã đổi " +"tên má»™t trong số chúng để có thể ghi lại cả hai." msgid "content" msgstr "ná»™i dung" @@ -17262,6 +17477,10 @@ msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải là m gì vá»›i %06o %s '%s'" #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "Gặp lá»—i khi hòa trá»™n mô-Ä‘un-con %s (kho chứa há»ng)" + +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Chuyển-tiếp-nhanh mô-Ä‘un-con '%s' đến lần chuyển giao sau đây:" @@ -17302,6 +17521,13 @@ msgstr "" msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Gặp lá»—i khi hòa trá»™n mô-Ä‘un-con '%s' (thấy nhiá»u hòa trá»™n Ä‘a trùng)" +msgid "failed to execute internal merge" +msgstr "Gặp lá»—i khi thá»±c hiện trá»™n ná»™i bá»™" + +#, c-format +msgid "unable to add %s to database" +msgstr "Không thể thêm %s và o cÆ¡ sở dữ liệu" + #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" @@ -17405,6 +17631,14 @@ msgstr "" "XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên thÆ° mục %s->%s trong %s. Äổi tên thÆ° mục " "%s->%s trong %s" +#, c-format +msgid "cannot read object %s" +msgstr "không thể Ä‘á»c đối tượng %s" + +#, c-format +msgid "object %s is not a blob" +msgstr "đối tượng %s không phải là má»™t blob" + msgid "modify" msgstr "sá»a đổi" @@ -17488,9 +17722,6 @@ msgstr "không hiểu cú pháp dòng: %s" msgid "malformed line: %s" msgstr "dòng sai quy cách: %s" -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "bá» qua multi-pack-index sẵn có; tổng kiểm không khá»›p" - msgid "could not load pack" msgstr "không thể tải gói" @@ -17498,6 +17729,9 @@ msgstr "không thể tải gói" msgid "could not open index for %s" msgstr "không thể mở chỉ mục cho %s" +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "bá» qua multi-pack-index sẵn có; tổng kiểm không khá»›p" + msgid "Adding packfiles to multi-pack-index" msgstr "Äang thêm táºp tin gói từ multi-pack-index" @@ -18103,6 +18337,17 @@ msgstr "không thể Ä‘á»c đối tượng: '%s'" msgid "hash mismatch %s" msgstr "mã băm không khá»›p %s" +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "đối tượng trùng lặp khi ghi chỉ mục bitmap: %s" + +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "đã cố ghi lần chuyển giao không được chá»n: '%s'" + +msgid "too many pseudo-merges" +msgstr "có quá nhiá»u lần pseudo-merge" + msgid "trying to write commit not in index" msgstr "đã thá» ghi lần chuyển giao nằm ngoà i chỉ mục" @@ -18125,6 +18370,17 @@ msgstr "táºp tin chỉ mục bitmap bị há»ng (quá ngắn để chứa bá»™ msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "táºp tin chỉ mục bitmap bị há»ng (quá ngắn để chứa bảng tìm kiếm)" +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "" +"táºp tin chỉ mục bitmap bị há»ng (quá ngắn để chứa Ä‘á» mục bảng pseudo-merge)" + +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "táºp tin chỉ mục bitmap bị há»ng (quá ngắn để chứa bảng pseudo-merge)" + +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "táºp tin chỉ mục bitmap bị há»ng, bảng pseudo-merge quá ngắn" + #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "đối tượng trùng lặp trong bitmap: '%s'" @@ -18215,6 +18471,10 @@ msgid "mismatch in bitmap results" msgstr "kết quả bitmap không khá»›p" #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "chỉ mục pseudo-merge vượt ngoà i phạm vi (%<PRIu32> >= %<PRIuMAX>)" + +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "không thể tìm thấy '%s' trong gói '%s' tại vị trà %<PRIuMAX>" @@ -18579,6 +18839,9 @@ msgstr "không thể tạo tiến trình lstat: %s" msgid "unable to parse --pretty format" msgstr "không thể Ä‘á»c định dạng --pretty" +msgid "lazy fetching disabled; some objects may not be available" +msgstr "vô hiệu lazy fetching; má»™t số đối tượng sẽ không có sẵn" + msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: không thể rẽ nhánh tuyến trình con fetch" @@ -18602,6 +18865,62 @@ msgstr "object-info: cần đẩy dữ liệu lên Ä‘Ä©a sau các tham số" msgid "Removing duplicate objects" msgstr "Äang gỡ các đối tượng trùng lặp" +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "gặp lá»—i khi Ä‘á»c biểu thức chÃnh quy pseudo-merge cho %s: '%s'" + +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s phải không âm, dùng mặc định thay thế" + +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s nên giữa 0 và 1, dùng mặc định thay thế" + +#, c-format +msgid "%s must be positive, using default" +msgstr "%s phải dÆ°Æ¡ng, dùng mặc định thay thế" + +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "nhóm pseudo-merge '%s' thiếu mẫu bắt buá»™c" + +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "nhóm pseudo-merge '%s' có unstable threshold trÆ°á»›c stable" + +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "" +"biểu thức chÃnh quy pseudo-merge từ cấu hình có quá nhiá»u nhóm chá»n (tối " +"Ä‘a=%<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "extended pseudo-merge Ä‘á»c ngoà i biên (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "mục extended pseudo-merge quá ngắn (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "" +"không thể tìm pseudo-merge cho lần chuyển giao %s tại vị trà %<PRIuMAX>" + +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "extended pseudo-merge lookup vượt ngoà i biên (%<PRIu32> >= %<PRIu32>)" + +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "Ä‘á»c ngoà i biên (%<PRIuMAX> >= %<PRIuMAX>)" + +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "không thể Ä‘á»c bảng extended pseudo-merge cho lần chuyển giao %s" + msgid "could not start `log`" msgstr "không thể khởi chạy `log`" @@ -18844,7 +19163,7 @@ msgstr "" " chỉ giữ ghi chú của lần chuyển giao nà y; -c giống nhÆ° -C " "nhÆ°ng\n" " mở trình biên soạn\n" -"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vá»\n" +"x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng shell\n" "b, break = dừng tại đây (tiếp tục cải tổ sau nà y bằng 'git rebase --" "continue')\n" "d, drop <commit> = xóa bá» lần chuyển giao\n" @@ -19206,11 +19525,18 @@ msgstr "nháºt ký cho tham chiếu %s kết thúc bất ngá» trên %s" msgid "log for %s is empty" msgstr "nháºt ký cho %s trống rá»—ng" +msgid "refusing to force and skip creation of reflog" +msgstr "từ chối bá» qua việc tạo log tham chiếu" + #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "từ chối cáºp nháºt tham chiếu vá»›i tên sai '%s'" #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "từ chối cáºp nháºt tham chiếu ảo '%s'" + +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref bị lá»—i cho ref '%s': %s" @@ -19241,6 +19567,25 @@ msgid "could not delete references: %s" msgstr "không thể xóa bá» tham chiếu: %s" #, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "Äã hoà n thà nh thá» chạy di cÆ° tham chiếu, kết quả tại '%s'\n" + +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "không thể xoá thÆ° mục tạm thá»i '%s'" + +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "ydam chiếu đã di cÆ° tại '%s'" + +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "" +"không thể lock tham chiếu '%s': cần tham chiếu má»m tá»›i '%s': nhÆ°ng lại là " +"tham chiếu thÆ°á»ng" + +#, c-format msgid "refname is dangerous: %s" msgstr "tên tham chiếu không an toà n: %s" @@ -19599,7 +19944,7 @@ msgstr "không thể tìm thấy tham chiếu máy chủ %s" #, c-format msgid "* Ignoring funny ref '%s' locally" -msgstr "* Äang bá» qua tham chiếu thú vị ná»™i bá»™ '%s'" +msgstr "* Äang bá» qua tham chiếu ná»™i bá»™ '%s'" #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" @@ -20062,9 +20407,9 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" -"Giải quyết vấn Ä‘á» nà y thủ công, hãy Ä‘anh dấu chúng đã được giải quyết bằng\n" -"hãy chạy lệnh \"git add/rm <các_táºp tin_xung_Ä‘á»™t>\", sau đó chạy \"git " -"rebase --continue\".\n" +"Hãy giải quyết vấn Ä‘á» nà y bằng tay, đánh dấu chúng đã được giải quyết bằng\n" +"lệnh \"git add/rm <các_táºp tin_xung_Ä‘á»™t>\", sau đó chạy \"git rebase --" +"continue\".\n" "Bạn có thể bá» qua bản vá, chạy \"git rebase --skip\".\n" "Äể huá»· bá» và quay trở lại trạng thái trÆ°á»›c \"git rebase\", chạy \"git rebase " "--abort\"." @@ -20183,7 +20528,7 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"bạn có các thay đổi so vá»›i trong bệ phóng trong thÆ° mục là m việc của bạn.\n" +"bạn có các thay đổi so vá»›i trong vùng chá» trong thÆ° mục là m việc của bạn.\n" "Nếu các thay đổi nà y là muốn squash và o lần chuyển giao kế trÆ°á»›c, chạy:\n" "\n" " git commit --amend %s\n" @@ -20397,6 +20742,47 @@ msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" msgstr "update-ref yêu cầu tên tham chiếu đầy đủ v.d. refs/heads/%s" #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' không nháºn đối số lần chuyển giao hoà trá»™n" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick' không cho phép dùng lần chuyển giao hoà trá»™n. Nếu nhÆ° cần phát lại\n" +"lần hoà trá»™n, hà y dùng 'merge -C'." + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword' không cho phép dùng lần chuyển giao hoà trá»™n. Nếu nhÆ° cần phát lại\n" +"lần hoà trá»™n và sá»a ná»™i dung, hãy dùng 'merge -c'." + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'pick' không cho phép dùng lần chuyển giao hoà trá»™n. Nếu nhÆ° cần phát lại\n" +"lần hoà trá»™n, hà y dùng 'merge -C', sau đó 'break' để dùng lệnh\n" +"'git commit --amend && git rebase --continue'." + +msgid "cannot squash merge commit into another commit" +msgstr "không thể squash lần chuyển giao hoà trá»™n và o lần chuyển giao khác" + +#, c-format msgid "invalid command '%.*s'" msgstr "lệnh không hợp lệ '%.*s'" @@ -20512,9 +20898,8 @@ msgstr "" msgid "cannot read HEAD" msgstr "không thể Ä‘á»c HEAD" -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "không thể sao chép '%s' sang '%s'" +msgid "could not write commit message file" +msgstr "không thể ghi táºp tin chú thÃch lần chuyển giao" #, c-format msgid "" @@ -20744,7 +21129,7 @@ msgid "Successfully rebased and updated %s.\n" msgstr "Cà i tổ và cáºp nháºt %s má»™t cách thà nh công.\n" msgid "cannot rebase: You have unstaged changes." -msgstr "không thể cải tổ: Bạn có các thay đổi chÆ°a được Ä‘Æ°a lên bệ phóng." +msgstr "không thể cải tổ: Bạn có các thay đổi chÆ°a được Ä‘Æ°a và o vùng chá»." msgid "cannot amend non-existing commit" msgstr "không thể tu sá»a lần chuyển giao không tồn tại" @@ -20774,7 +21159,7 @@ msgid "could not remove CHERRY_PICK_HEAD" msgstr "không thể xóa bá» CHERRY_PICK_HEAD" msgid "could not commit staged changes." -msgstr "không thể chuyển giao các thay đổi đã Ä‘Æ°a lên bệ phóng." +msgstr "không thể chuyển giao các thay đổi đã Ä‘Æ°a và o vùng chá»." #, c-format msgid "%s: can't cherry-pick a %s" @@ -20915,6 +21300,18 @@ msgstr "không thể quay lại thÆ° mục là m việc hiện hà nh" msgid "failed to stat '%*s%s%s'" msgstr "gặp lá»—i khi stat'%*s%s%s'" +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"kho lÆ°u trữ '%s' thuá»™c sở hữu của ngÆ°á»i khác\n" +"%sÄể thêm ngoại lệ cho thÆ° mục nà y, hãy gá»i:\n" +"\n" +"\tgit config --global --add safe.directory %s" + msgid "Unable to read current working directory" msgstr "Không thể Ä‘á»c thÆ° mục là m việc hiện hà nh" @@ -20937,18 +21334,6 @@ msgstr "" "được đặt)." #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"kho lÆ°u trữ '%s' thuá»™c sở hữu của ngÆ°á»i khác\n" -"%sÄể thêm ngoại lệ cho thÆ° mục nà y, hãy gá»i:\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "không thể dùng kho chứa bare '%s' (safe.bareRepository là '%s')" @@ -21249,6 +21634,15 @@ msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "thÆ° mục git mô Ä‘un con '%s' là bên trong git DIR '%.*s'" #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "" +"cần '%.*s' trong Ä‘Æ°á»ng dẫn tá»›i mô-Ä‘un-con '%s' không phải là liên kết má»m" + +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "cần Ä‘Æ°á»ng dẫn tá»›i mô-Ä‘un-con '%s' không phải là liên kết má»m" + +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" @@ -21287,10 +21681,6 @@ msgstr "gặp lá»—i khi lstat '%s'" msgid "no remote configured to get bundle URIs from" msgstr "không có máy chủ để lấy URI bundle" -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "máy chủ '%s' không có cấu hình URL" - msgid "could not get the bundle-uri list" msgstr "không thể lấy vá» danh sách bundle-uri" @@ -21915,7 +22305,7 @@ msgid "error: unable to format message: %s\n" msgstr "lá»—i: không thể định dạng thông Ä‘iệp: %s\n" msgid "usage: " -msgstr "cách dùng: %s" +msgstr "cách dùng: " msgid "fatal: " msgstr "lá»—i nghiêm trá»ng: " @@ -22033,7 +22423,7 @@ msgid "Unmerged paths:" msgstr "Những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n:" msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr " (dùng \"git restore --staged <táºp-tin>...\" để bá» ra khá»i bệ phóng)" +msgstr " (dùng \"git restore --staged <táºp-tin>...\" để bá» ra khá»i vùng chá»)" #, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" @@ -22042,7 +22432,7 @@ msgstr "" "phóng)" msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (dùng \"git rm --cached <táºp-tin>...\" để bá» ra khá»i bệ phóng)" +msgstr " (dùng \"git rm --cached <táºp-tin>...\" để bá» ra khá»i vùng chá»)" msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (dùng \"git add <táºp-tin>...\" để đánh dấu là muốn thêm)" @@ -22057,7 +22447,7 @@ msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" msgid "Changes not staged for commit:" -msgstr "Các thay đổi chÆ°a được đặt lên bệ phóng để chuyển giao:" +msgstr "Các thay đổi chÆ°a được đặt và o vùng chỠđể chuyển giao:" msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" @@ -22465,7 +22855,7 @@ msgstr "đứng trÆ°á»›c " #. TRANSLATORS: the action is e.g. "pull with rebase" #, c-format msgid "cannot %s: You have unstaged changes." -msgstr "không thể %s: Bạn có các thay đổi chÆ°a được Ä‘Æ°a lên bệ phóng." +msgstr "không thể %s: Bạn có các thay đổi chÆ°a được Ä‘Æ°a và o vùng chá»." msgid "additionally, your index contains uncommitted changes." msgstr "ngoà i ra, chỉ mục của bạn có chứa các thay đổi chÆ°a được chuyển giao." @@ -22526,11 +22916,11 @@ msgstr "" msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" -"Không thể ghi lại các nhánh: Bạn có các thay đổi chÆ°a được Ä‘Æ°a lên bệ phóng." +"Không thể ghi lại các nhánh: Bạn có các thay đổi chÆ°a được Ä‘Æ°a và o vùng chá»." #, sh-format msgid "Cannot $action: You have unstaged changes." -msgstr "Không thể $action: Bạn có các thay đổi chÆ°a được Ä‘Æ°a lên bệ phóng." +msgstr "Không thể $action: Bạn có các thay đổi chÆ°a được Ä‘Æ°a và o vùng chá»." #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." @@ -22751,7 +23141,7 @@ msgstr "" #. translation. The program will only accept English input #. at this point. msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "Gá»i email nà y chứ? ([y]có|[n]không|[e]sá»a|[q]thoát|[a]tất): " +msgstr "Gá»i email nà y chứ? ([y]có|[n]không|[e]sá»a|[q]thoát|[a]tất cả): " msgid "Send this email reply required" msgstr "Hãy trả lá»i yêu cầu gá»i email" @@ -22776,24 +23166,24 @@ msgid "Failed to send %s\n" msgstr "Gặp lá»—i khi gá»i %s\n" #, perl-format -msgid "Dry-Sent %s\n" -msgstr "Thá» gá»i %s\n" +msgid "Dry-Sent %s" +msgstr "Thá» gá»i %s" #, perl-format -msgid "Sent %s\n" -msgstr "Gá»i %s\n" +msgid "Sent %s" +msgstr "Gá»i %s" -msgid "Dry-OK. Log says:\n" -msgstr "Thá» gá»i OK. Nháºt ký ghi lại:\n" +msgid "Dry-OK. Log says:" +msgstr "Thá» gá»i OK. Nháºt ký ghi lại:" -msgid "OK. Log says:\n" -msgstr "OK. Nháºt ký ghi lại:\n" +msgid "OK. Log says:" +msgstr "OK. Nháºt ký ghi lại:" msgid "Result: " msgstr "Kết quả: " -msgid "Result: OK\n" -msgstr "Kết quả: OK\n" +msgid "Result: OK" +msgstr "Kết quả: OK" #, perl-format msgid "can't open file %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4838c19b0b..91b8b79de8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -154,8 +154,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-28 19:59+0800\n" -"PO-Revision-Date: 2024-04-28 20:31+0800\n" +"POT-Creation-Date: 2024-07-27 22:28+0800\n" +"PO-Revision-Date: 2024-07-28 19:52+0800\n" "Last-Translator: Teng Long <dyroneteng@gmail.com>\n" "Language-Team: GitHub <https://github.com/dyrone/git/>\n" "Language: zh_CN\n" @@ -252,12 +252,12 @@ msgstr[1] "å¢žåŠ äº† %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未åˆå…¥çš„：%s" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "Only binary files changed.\n" msgstr "åªæœ‰äºŒè¿›åˆ¶æ–‡ä»¶è¢«ä¿®æ”¹ã€‚\n" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "No changes.\n" msgstr "没有修改。\n" @@ -799,6 +799,11 @@ msgstr "" "? - 显示帮助\n" #: add-patch.c +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "预期åªæœ‰ä¸€ä¸ªå—æ¯ï¼Œå¾—到 '%s'" + +#: add-patch.c msgid "No previous hunk" msgstr "没有å‰ä¸€ä¸ªå—" @@ -861,9 +866,22 @@ msgid "Sorry, cannot edit this hunk" msgstr "对ä¸èµ·ï¼Œä¸èƒ½ç¼–辑这个å—" #: add-patch.c +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "未知命令 '%s'（使用 '?' 寻求帮助）" + +#: add-patch.c msgid "'git apply' failed" msgstr "'git apply' 失败" +#: add-patch.c +msgid "No changes." +msgstr "没有修改。" + +#: add-patch.c +msgid "Only binary files changed." +msgstr "åªæœ‰äºŒè¿›åˆ¶æ–‡ä»¶è¢«ä¿®æ”¹ã€‚" + #: advice.c #, c-format msgid "" @@ -1036,7 +1054,7 @@ msgid "unclosed quote" msgstr "未关é—的引å·" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "太多å‚æ•°" @@ -1918,6 +1936,10 @@ msgid "ignoring overly large gitattributes blob '%s'" msgstr "忽略过大的 gitattributes æ•°æ®å¯¹è±¡ '%s'" #: attr.c +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "æ— æ³•åœ¨æ²¡æœ‰å˜å‚¨åº“的情况下使用 --attr-source 或 GIT_ATTR_SOURCE" + +#: attr.c msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE" @@ -2278,14 +2300,6 @@ msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" #: builtin/add.c -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"设置 add.interactive.useBuiltin å·²ç»è¢«ç§»é™¤ï¼\n" -"查看 'git help config' ä¸çš„相关æ¡ç›®ä»¥èŽ·å–更多信æ¯ã€‚" - -#: builtin/add.c msgid "could not read the index" msgstr "ä¸èƒ½è¯»å–索引" @@ -2720,7 +2734,7 @@ msgid "" "Not rewinding to ORIG_HEAD" msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c builtin/bisect.c worktree.c +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "æ— æ³•è¯»å– '%s'" @@ -2798,8 +2812,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c +#: builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "æ ¼å¼" @@ -2836,6 +2850,10 @@ msgid "show the patch being applied" msgstr "显示æ£åœ¨åº”用的补ä¸" #: builtin/am.c +msgid "try to apply current patch again" +msgstr "å°è¯•å†æ¬¡åº”用当å‰è¡¥ä¸" + +#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "把空补ä¸è®°å½•ä¸ºç©ºæ交" @@ -2907,10 +2925,6 @@ msgid "could not redirect output" msgstr "ä¸èƒ½é‡å®šå‘输出" #: builtin/archive.c -msgid "git archive: Remote with no URL" -msgstr "git archive：未æ供远程 URL" - -#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，å´å¾—到 flush 包" @@ -4024,6 +4038,10 @@ msgstr "需è¦ä¸€ä¸ªä»“库æ¥åˆ›å»ºå½’档包。" msgid "do not show bundle details" msgstr "ä¸æ˜¾ç¤ºå½’档包的细节" +#: builtin/bundle.c bundle.c +msgid "need a repository to verify a bundle" +msgstr "需è¦ä¸€ä¸ªä»“库æ¥æ ¡éªŒä¸€ä¸ªå½’档包" + #: builtin/bundle.c #, c-format msgid "%s is okay\n" @@ -5064,9 +5082,9 @@ msgstr "交互å¼æ¸…除" msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c -#: ref-filter.h +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c +#: builtin/show-ref.c ref-filter.h msgid "pattern" msgstr "模å¼" @@ -5284,6 +5302,16 @@ msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/clone.c #, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "æ— æ³•æ£€æŸ¥ '%s' 处的硬链接" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "硬链接与 '%s' 处的æºä¸åŒ" + +#: builtin/clone.c +#, c-format msgid "failed to create link '%s'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" @@ -5358,7 +5386,7 @@ msgstr "太多å‚数。" msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚" -#: builtin/clone.c builtin/init-db.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "未知的引用å˜å‚¨æ ¼å¼ '%s'" @@ -5967,7 +5995,7 @@ msgstr "%sæ交者：%.*s <%.*s>" msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" msgstr "æ— æ³•å°†å°¾æ³¨ä¼ é€’ç»™ --trailers" @@ -6177,11 +6205,11 @@ msgstr "ä½¿ç”¨è‡ªåŠ¨æŒ¤åŽ‹æ ¼å¼çš„æ交说明用以挤压至指定的æ交" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我（和 -C/-c/--amend å‚数共用）" -#: builtin/commit.c builtin/interpret-trailers.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c msgid "trailer" msgstr "尾注" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "add custom trailer(s)" msgstr "æ·»åŠ è‡ªå®šä¹‰å°¾æ³¨" @@ -6293,17 +6321,57 @@ msgstr "" "ç£ç›˜é…é¢å·²è€—尽，然åŽæ‰§è¡Œ \"git restore --staged :/\" æ¢å¤ã€‚" #: builtin/config.c -msgid "git config [<options>]" -msgstr "git config [<选项>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<文件选项>] [<显示选项>] [--includes]" #: builtin/config.c -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "未能识别的 --type å‚数，%s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<æ£åˆ™" +"表达å¼>] [--value=<值>] [--fixed-value] [--default=<默认值>] <å称>" #: builtin/config.c -msgid "only one type at a time" -msgstr "一次åªèƒ½ä¸€ä¸ªç±»åž‹" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-" +"value] <å称> <值>" + +#: builtin/config.c +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <å称> <" +"值>" + +#: builtin/config.c +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<文件选项>] <æ—§å称> <æ–°å称>" + +#: builtin/config.c +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<文件选项>] <å称>" + +#: builtin/config.c +msgid "git config edit [<file-option>]" +msgstr "git config edit [<文件选项>]" + +#: builtin/config.c +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<文件选项>] --get-colorbool <å称> [<æ ‡å‡†è¾“å‡ºä¸ºtty>]" + +#: builtin/config.c +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<文件选项>] [--type=<类型>] [--comment=<消æ¯>] [--all] [--" +"value=<值>] [--fixed-value] <å称> <值>" #: builtin/config.c msgid "Config file location" @@ -6338,70 +6406,6 @@ msgid "read config from given blob object" msgstr "从给定的数æ®å¯¹è±¡è¯»å–é…ç½®" #: builtin/config.c -msgid "Action" -msgstr "æ“作" - -#: builtin/config.c -msgid "get value: name [value-pattern]" -msgstr "获å–值：å称 [值模å¼]" - -#: builtin/config.c -msgid "get all values: key [value-pattern]" -msgstr "获得所有的值：键 [值模å¼]" - -#: builtin/config.c -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "æ ¹æ®æ£åˆ™è¡¨è¾¾å¼èŽ·å¾—值：å称æ£åˆ™ [值模å¼]" - -#: builtin/config.c -msgid "get value specific for the URL: section[.var] URL" -msgstr "获得 URL å–值：section[.var] URL" - -#: builtin/config.c -msgid "replace all matching variables: name value [value-pattern]" -msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šå称 值 [值模å¼]" - -#: builtin/config.c -msgid "add a new variable: name value" -msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šå称 值" - -#: builtin/config.c -msgid "remove a variable: name [value-pattern]" -msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šå称 [值模å¼]" - -#: builtin/config.c -msgid "remove all matches: name [value-pattern]" -msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项：å称 [值模å¼]" - -#: builtin/config.c -msgid "rename section: old-name new-name" -msgstr "é‡å‘½åå°èŠ‚：old-name new-name" - -#: builtin/config.c -msgid "remove a section: name" -msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚：name" - -#: builtin/config.c -msgid "list all" -msgstr "列出所有" - -#: builtin/config.c -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "在比较值与 '值模å¼' 时，使用å—符串å—é¢æ¯”较" - -#: builtin/config.c -msgid "open an editor" -msgstr "打开一个编辑器" - -#: builtin/config.c -msgid "find the color configured: slot [default]" -msgstr "获得é…置的颜色：é…ç½® [默认]" - -#: builtin/config.c -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "获得颜色设置：é…ç½® [stdout-is-tty]" - -#: builtin/config.c msgid "Type" msgstr "类型" @@ -6438,8 +6442,8 @@ msgid "value is an expiry date" msgstr "值是一个到期日期" #: builtin/config.c -msgid "Other" -msgstr "其它" +msgid "Display options" +msgstr "显示选项" #: builtin/config.c msgid "terminate values with NUL byte" @@ -6450,10 +6454,6 @@ msgid "show variable names only" msgstr "åªæ˜¾ç¤ºå˜é‡å" #: builtin/config.c -msgid "respect include directives on lookup" -msgstr "查询时å‚ç…§ include 指令递归查找" - -#: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令行）" @@ -6462,16 +6462,17 @@ msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示é…置的作用域（工作区ã€æœ¬åœ°ã€å…¨å±€ã€ç³»ç»Ÿã€å‘½ä»¤ï¼‰" #: builtin/config.c -msgid "value" -msgstr "å–值" +msgid "show config keys in addition to their values" +msgstr "显示é…置键åŠå…¶å€¼" #: builtin/config.c -msgid "with --get, use default value when missing entry" -msgstr "使用 --get å‚数，当缺少设置时使用默认值" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "未能识别的 --type å‚数，%s" #: builtin/config.c -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "人类å¯è¯»çš„注释å—符串（# å°†æ ¹æ®éœ€è¦æ·»åŠ 到å‰é¢ï¼‰" +msgid "only one type at a time" +msgstr "一次åªèƒ½ä¸€ä¸ªç±»åž‹" #: builtin/config.c #, c-format @@ -6564,56 +6565,93 @@ msgstr "" "详情请阅读“git help worktreeâ€çš„“CONFIGURATION FILEâ€å°èŠ‚" #: builtin/config.c -msgid "--get-color and variable type are incoherent" -msgstr "--get-color å’Œå˜é‡ç±»åž‹ä¸å…¼å®¹" +msgid "Other" +msgstr "其它" #: builtin/config.c -msgid "only one action at a time" -msgstr "一次åªèƒ½æœ‰ä¸€ä¸ªåŠ¨ä½œ" +msgid "respect include directives on lookup" +msgstr "查询时å‚ç…§ include 指令递归查找" #: builtin/config.c -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only 仅适用于 --list 或 --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "æ— æ³•è¯»å–é…置文件 '%s'" #: builtin/config.c -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "--show-origin 仅适用于 --getã€--get-allã€--get-regexp å’Œ --list" +msgid "error processing config file(s)" +msgstr "处ç†é…置文件出错" #: builtin/config.c -msgid "--default is only applicable to --get" -msgstr "--default 仅适用于 --get" +msgid "Filter options" +msgstr "过滤选项" #: builtin/config.c -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment 仅适用于 add/set/replace æ“作" +msgid "return all values for multi-valued config options" +msgstr "返回多值é…置选项的所有值" + +#: builtin/config.c +msgid "interpret the name as a regular expression" +msgstr "å°†å称解释为æ£åˆ™è¡¨è¾¾å¼" + +#: builtin/config.c +msgid "show config with values matching the pattern" +msgstr "显示值与模å¼åŒ¹é…çš„é…ç½®" + +#: builtin/config.c +msgid "use string equality when comparing values to value pattern" +msgstr "在将值与值模å¼è¿›è¡Œæ¯”较时使用å—符串相ç‰æ€§" + +#: builtin/config.c +msgid "URL" +msgstr "URL" + +#: builtin/config.c +msgid "show config matching the given URL" +msgstr "显示与给定 URL 匹é…çš„é…ç½®" + +#: builtin/config.c +msgid "value" +msgstr "值" + +#: builtin/config.c +msgid "use default value when missing entry" +msgstr "缺少æ¡ç›®æ—¶ä½¿ç”¨é»˜è®¤å€¼" #: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 仅适用于有 '值模å¼'" #: builtin/config.c -#, c-format -msgid "unable to read config file '%s'" -msgstr "æ— æ³•è¯»å–é…置文件 '%s'" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= ä¸èƒ½ä¸Ž --all 或 --url= 一起使用" #: builtin/config.c -msgid "error processing config file(s)" -msgstr "处ç†é…置文件出错" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= ä¸èƒ½ä¸Ž --allã€--regexp 或 --value 一起使用" #: builtin/config.c -msgid "editing stdin is not supported" -msgstr "ä¸æ”¯æŒç¼–è¾‘æ ‡å‡†è¾“å…¥" +msgid "Filter" +msgstr "过滤器" #: builtin/config.c -msgid "editing blobs is not supported" -msgstr "ä¸æ”¯æŒç¼–辑数æ®å¯¹è±¡" +msgid "replace multi-valued config option with new value" +msgstr "将多值é…置选项替æ¢ä¸ºæ–°å€¼" #: builtin/config.c -#, c-format -msgid "cannot create configuration file %s" -msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人类å¯è¯»çš„注释å—符串（# å°†æ ¹æ®éœ€è¦æ·»åŠ 到å‰é¢ï¼‰" + +#: builtin/config.c +msgid "add a new line without altering any existing values" +msgstr "æ·»åŠ æ–°è¡Œè€Œä¸æ›´æ”¹ä»»ä½•çŽ°æœ‰å€¼" + +#: builtin/config.c +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value åªèƒ½ä¸Ž --value=<模å¼> é…åˆä½¿ç”¨" + +#: builtin/config.c +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append ä¸èƒ½ä¸Ž --value=<模å¼> 一起使用" #: builtin/config.c #, c-format @@ -6629,6 +6667,109 @@ msgstr "" msgid "no such section: %s" msgstr "æ— æ¤å°èŠ‚：%s" +#: builtin/config.c +msgid "editing stdin is not supported" +msgstr "ä¸æ”¯æŒç¼–è¾‘æ ‡å‡†è¾“å…¥" + +#: builtin/config.c +msgid "editing blobs is not supported" +msgstr "ä¸æ”¯æŒç¼–辑数æ®å¯¹è±¡" + +#: builtin/config.c +#, c-format +msgid "cannot create configuration file %s" +msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s" + +#: builtin/config.c +msgid "Action" +msgstr "æ“作" + +#: builtin/config.c +msgid "get value: name [<value-pattern>]" +msgstr "获å–值：name [<值模å¼>]" + +#: builtin/config.c +msgid "get all values: key [<value-pattern>]" +msgstr "获å–所有值：key [<值模å¼>]" + +#: builtin/config.c +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "获å–æ£åˆ™è¡¨è¾¾å¼çš„值：name-regex [<值模å¼>]" + +#: builtin/config.c +msgid "get value specific for the URL: section[.var] URL" +msgstr "获得 URL å–值：section[.var] URL" + +#: builtin/config.c +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [<值模å¼>]" + +#: builtin/config.c +msgid "add a new variable: name value" +msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šå称 值" + +#: builtin/config.c +msgid "remove a variable: name [<value-pattern>]" +msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šå称 [<值模å¼>]" + +#: builtin/config.c +msgid "remove all matches: name [<value-pattern>]" +msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项：å称 [<值模å¼>]" + +#: builtin/config.c +msgid "rename section: old-name new-name" +msgstr "é‡å‘½åå°èŠ‚：old-name new-name" + +#: builtin/config.c +msgid "remove a section: name" +msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚：name" + +#: builtin/config.c +msgid "list all" +msgstr "列出所有" + +#: builtin/config.c +msgid "open an editor" +msgstr "打开编辑器" + +#: builtin/config.c +msgid "find the color configured: slot [<default>]" +msgstr "找到é…置的颜色：slot [<默认>]" + +#: builtin/config.c +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "找到颜色设置：slot [<stdout-is-tty>]" + +#: builtin/config.c +msgid "with --get, use default value when missing entry" +msgstr "使用 --get å‚数，当缺少设置时使用默认值" + +#: builtin/config.c +msgid "--get-color and variable type are incoherent" +msgstr "--get-color å’Œå˜é‡ç±»åž‹ä¸å…¼å®¹" + +#: builtin/config.c +msgid "no action specified" +msgstr "未指定任何æ“作" + +#: builtin/config.c +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only 仅适用于 --list 或 --get-regexp" + +#: builtin/config.c +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin 仅适用于 --getã€--get-allã€--get-regexp å’Œ --list" + +#: builtin/config.c +msgid "--default is only applicable to --get" +msgstr "--default 仅适用于 --get" + +#: builtin/config.c +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment 仅适用于 add/set/replace æ“作" + #: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" @@ -7655,6 +7796,10 @@ msgid "config key storing a list of repository paths" msgstr "å˜å‚¨ç€ä»“库路径列表的é…置项键å" #: builtin/for-each-repo.c +msgid "keep going even if command fails in a repository" +msgstr "å³ä½¿å˜å‚¨åº“ä¸çš„命令失败，ä»ç»§ç»æ‰§è¡Œ" + +#: builtin/for-each-repo.c msgid "missing --config=<config>" msgstr "缺少 --config=<é…ç½®>" @@ -9489,8 +9634,12 @@ msgid "max length of output filename" msgstr "输出文件å的最大长度" #: builtin/log.c -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "使用 [RFC PATCH] 代替 [PATCH]" +msgid "rfc" +msgstr "RFC" + +#: builtin/log.c +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "在 'PATCH' 之å‰æ·»åŠ <RFC> （默认为 'RFC'）" #: builtin/log.c msgid "cover-from-description-mode" @@ -9834,11 +9983,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<å¯æ‰§è¡Œæ–‡ä»¶>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<å¯æ‰§è¡Œæ–‡ä»¶>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<é”®>]\n" " [--symref] [<仓库> [<模å¼>...]]" @@ -9859,9 +10008,13 @@ msgid "limit to tags" msgstr "ä»…é™äºŽæ ‡ç¾" #: builtin/ls-remote.c -msgid "limit to heads" +msgid "limit to branches" msgstr "ä»…é™äºŽåˆ†æ”¯" +#: builtin/ls-remote.c builtin/show-ref.c +msgid "deprecated synonym for --branches" +msgstr "已弃用的 --branches åŒä¹‰è¯" + #: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "ä¸æ˜¾ç¤ºå·²è§£æžçš„æ ‡ç¾" @@ -13048,6 +13201,27 @@ msgstr "未指定è¦åˆ 除的引用日志" msgid "invalid ref format: %s" msgstr "æ— æ•ˆçš„å¼•ç”¨æ ¼å¼ï¼š%s" +#: builtin/refs.c +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<æ ¼å¼> [--dry-run]" + +#: builtin/refs.c +msgid "specify the reference format to convert to" +msgstr "指定è¦è½¬æ¢çš„å¼•ç”¨æ ¼å¼" + +#: builtin/refs.c +msgid "perform a non-destructive dry-run" +msgstr "进行éžç ´å性的试è¿è¡Œï¼ˆdry-run）" + +#: builtin/refs.c +msgid "missing --ref-format=<format>" +msgstr "缺少 --ref-format=<æ ¼å¼>" + +#: builtin/refs.c +#, c-format +msgid "repository already uses '%s' format" +msgstr "仓库已使用 '%s' æ ¼å¼" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13392,10 +13566,6 @@ msgstr "* 远程 %s" msgid " Fetch URL: %s" msgstr " 获å–地å€ï¼š%s" -#: builtin/remote.c -msgid "(no URL)" -msgstr "(æ— URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -13406,6 +13576,10 @@ msgid " Push URL: %s" msgstr " 推é€åœ°å€ï¼š%s" #: builtin/remote.c +msgid "(no URL)" +msgstr "(æ— URL)" + +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" @@ -13542,11 +13716,6 @@ msgid "return all URLs" msgstr "返回所有 URL 地å€" #: builtin/remote.c -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "没有给远程仓库 '%s' 设定 URL" - -#: builtin/remote.c msgid "manipulate push URLs" msgstr "æ“ä½œæŽ¨é€ URLS" @@ -14793,12 +14962,12 @@ msgstr "未知的哈希算法" #: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<模å¼>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<模å¼>...]" #: builtin/show-ref.c msgid "" @@ -14827,12 +14996,12 @@ msgid "failed to look up reference" msgstr "æ— æ³•æ‰¾åˆ°å¼•ç”¨" #: builtin/show-ref.c -msgid "only show tags (can be combined with heads)" -msgstr "åªæ˜¾ç¤ºæ ‡ç¾ï¼ˆå¯ä»¥å’Œå¤´å…±ç”¨ï¼‰" +msgid "only show tags (can be combined with branches)" +msgstr "ä»…æ˜¾ç¤ºæ ‡ç¾ï¼ˆå¯ä¸Žåˆ†æ”¯ç»„åˆä½¿ç”¨ï¼‰" #: builtin/show-ref.c -msgid "only show heads (can be combined with tags)" -msgstr "åªæ˜¾ç¤ºå¤´ï¼ˆå¯ä»¥å’Œæ ‡ç¾å…±ç”¨ï¼‰" +msgid "only show branches (can be combined with tags)" +msgstr "仅显示分支（å¯ä»¥å’Œæ ‡ç¾ç»„åˆä½¿ç”¨ï¼‰" #: builtin/show-ref.c msgid "check for reference existence without resolving" @@ -15579,20 +15748,20 @@ msgstr "ä¸èƒ½è¯†åˆ« submodule.alternateErrorStrategy çš„å–值 '%s'" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "ä¸èƒ½è¯†åˆ« submodule.alternateLocation çš„å–值 '%s'" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c submodule.c #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "æ‹’ç»åœ¨å¦ä¸€ä¸ªå模组的 git 目录ä¸åˆ›å»º/使用 '%s'" #: builtin/submodule--helper.c #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "æ— æ³•å…‹éš† '%s' 到å模组路径 '%s'" +msgid "directory not empty: '%s'" +msgstr "目录éžç©ºï¼š'%s'" #: builtin/submodule--helper.c #, c-format -msgid "directory not empty: '%s'" -msgstr "目录éžç©ºï¼š'%s'" +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "æ— æ³•å…‹éš† '%s' 到å模组路径 '%s'" #: builtin/submodule--helper.c #, c-format @@ -16033,9 +16202,11 @@ msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <ç§é’¥ ID>] [-f] [-m <消æ¯> | -F <文件>] [-e]\n" +"git tag [-a | -s | -u <ç§é’¥ id>] [-f] [-m <消æ¯> | -F <文件>] [-e]\n" +" [(--trailer <令牌>[(=|:)<值>])...]\n" " <æ ‡ç¾å> [<æ交> | <对象>]" #: builtin/tag.c @@ -17080,10 +17251,6 @@ msgid "Repository lacks these prerequisite commits:" msgstr "仓库ä¸ç¼ºå°‘这些必备的æ交：" #: bundle.c -msgid "need a repository to verify a bundle" -msgstr "需è¦ä¸€ä¸ªä»“库æ¥æ ¡éªŒä¸€ä¸ªå½’档包" - -#: bundle.c msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -17604,6 +17771,10 @@ msgid "Manage reflog information" msgstr "ç®¡ç† reflog ä¿¡æ¯" #: command-list.h +msgid "Low-level access to refs" +msgstr "对引用的低级访问" + +#: command-list.h msgid "Manage set of tracked repositories" msgstr "管ç†å·²è·Ÿè¸ªä»“库" @@ -18000,6 +18171,13 @@ msgid "commit-graph required commit data chunk missing or corrupted" msgstr "æ交图所需的æ交数æ®å—缺失或æŸå" #: commit-graph.c +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "由于ä¸å…¼å®¹çš„设置，æ£åœ¨ç¦ç”¨æ交图层 '%s' 的布隆过滤器" + +#: commit-graph.c msgid "commit-graph has no base graphs chunk" msgstr "æ交图没有基础图形å—" @@ -18159,6 +18337,13 @@ msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "æ£å°è¯•å†™æ交图，但是 'core.commitGraph' 被ç¦ç”¨" #: commit-graph.c +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " +"(%d) is not supported" +msgstr "å°è¯•å†™å…¥æ交图，但ä¸æ”¯æŒ 'commitGraph.changedPathsVersion' (%d)" + +#: commit-graph.c msgid "too many commits to write graph" msgstr "æ交太多ä¸èƒ½ç”»å›¾" @@ -20418,16 +20603,19 @@ msgstr "å› ä¸ºç¼ºå°‘ Unix 套接å—支æŒï¼Œå¥—接å—目录 '%s' 与 fsmonitor ä msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <路径>] [-c <å称>=<å–值>]\n" " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<å称>]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [\"--" +"no-lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<路径>]\n" +" [--work-tree=<路径>] [--namespace=<å称>]\n" " [--config-env=<å称>=<环境å˜é‡>] <命令> [<å‚æ•°>]" #: git.c @@ -20834,14 +21022,14 @@ msgstr "" "é…ç½® `git config advice.ignoredHook false` æ¥å…³é—è¿™æ¡è¦å‘Šã€‚" #: http-fetch.c +msgid "not a git repository" +msgstr "ä¸æ˜¯ git 仓库" + +#: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "--packfile çš„å‚数必须是有效的哈希值（得到 '%s'）" -#: http-fetch.c -msgid "not a git repository" -msgstr "ä¸æ˜¯ git 仓库" - #: http.c #, c-format msgid "negative value for http.postBuffer; defaulting to %d" @@ -20856,6 +21044,10 @@ msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "ä¸æ”¯æŒå…¬é’¥æ–‡ä»¶é”å®šï¼Œå› ä¸º cURL < 7.39.0" #: http.c +msgid "Unknown value for http.proactiveauth" +msgstr "http.proactiveauth 为未知å–值" + +#: http.c msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "ä¸æ”¯æŒ CURLSSLOPT_NO_REVOKEï¼Œå› ä¸º cURL < 7.44.0" @@ -20875,6 +21067,14 @@ msgid "Could not set SSL backend to '%s': already set" msgstr "æ— æ³•å°† SSL åŽç«¯è®¾ç½®ä¸º '%s'：已ç»è®¾ç½®" #: http.c +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "æ‹’ç»ä»Ž http.cookiefile '-' è¯»å– cookies" + +#: http.c +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "å› ä¸º http.cookiefile 为空，忽略 http.savecookies" + +#: http.c #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21080,10 +21280,10 @@ msgstr "æ— æ³•åˆå¹¶å模组 %s （没有åˆå¹¶åŸºçº¿ï¼‰" msgid "Failed to merge submodule %s (commits not present)" msgstr "æ— æ³•åˆå¹¶å模组 %s（æ交ä¸å˜åœ¨ï¼‰" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "æ— æ³•åˆå¹¶å模组 %s（仓库æŸå）" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "é”™è¯¯ï¼šæ— æ³•åˆå¹¶å模组 %s（仓库æŸå）" #: merge-ort.c merge-recursive.c #, c-format @@ -21115,14 +21315,15 @@ msgstr "" "æ— æ³•åˆå¹¶å模组 %s，但是å˜åœ¨å¤šä¸ªå¯èƒ½çš„åˆå¹¶ï¼š\n" "%s" -#: merge-ort.c merge-recursive.c -msgid "failed to execute internal merge" -msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" +#: merge-ort.c +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "é”™è¯¯ï¼šæ— æ³•ä¸º %s 执行内部åˆå¹¶" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "unable to add %s to database" -msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" +msgid "error: unable to add %s to database" +msgstr "错误：ä¸èƒ½æ·»åŠ %s 至对象库" #: merge-ort.c merge-recursive.c #, c-format @@ -21220,15 +21421,15 @@ msgstr "" msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "冲çªï¼ˆé‡å‘½å/åˆ é™¤ï¼‰ï¼š%1$s 在 %3$s ä¸é‡å‘½å为 %2$s，但在 %4$s ä¸åˆ 除。" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "cannot read object %s" -msgstr "ä¸èƒ½è¯»å–对象 %s" +msgid "error: cannot read object %s" +msgstr "错误：ä¸èƒ½è¯»å–对象 %s" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "object %s is not a blob" -msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" +msgid "error: object %s is not a blob" +msgstr "错误：对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" #: merge-ort.c #, c-format @@ -21384,6 +21585,11 @@ msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" #: merge-recursive.c #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "æ— æ³•åˆå¹¶å模组 %s（仓库æŸå）" + +#: merge-recursive.c +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "å模组 %s 快进到如下æ交：" @@ -21428,6 +21634,15 @@ msgid "Failed to merge submodule %s (multiple merges found)" msgstr "æ— æ³•åˆå¹¶å模组 %s （å‘现多个åˆå¹¶ï¼‰" #: merge-recursive.c +msgid "failed to execute internal merge" +msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" + +#: merge-recursive.c +#, c-format +msgid "unable to add %s to database" +msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" + +#: merge-recursive.c #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒ç»ä¸¢å¤±æœªè·Ÿè¸ªæ–‡ä»¶ '%s'，而是写入 %s。" @@ -21541,6 +21756,16 @@ msgstr "" "%4$s->%5$s" #: merge-recursive.c +#, c-format +msgid "cannot read object %s" +msgstr "ä¸èƒ½è¯»å–对象 %s" + +#: merge-recursive.c +#, c-format +msgid "object %s is not a blob" +msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" + +#: merge-recursive.c msgid "modify" msgstr "修改" @@ -21645,10 +21870,6 @@ msgid "malformed line: %s" msgstr "æ ¼å¼é”™è¯¯çš„行：%s" #: midx-write.c -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略已å˜åœ¨çš„å¤šåŒ…ç´¢å¼•ï¼Œæ ¡éªŒç ä¸åŒ¹é…" - -#: midx-write.c msgid "could not load pack" msgstr "ä¸èƒ½è½½å…¥åŒ…" @@ -21658,6 +21879,10 @@ msgid "could not open index for %s" msgstr "ä¸èƒ½æ‰“å¼€ %s 的索引" #: midx-write.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略已å˜åœ¨çš„å¤šåŒ…ç´¢å¼•ï¼Œæ ¡éªŒç ä¸åŒ¹é…" + +#: midx-write.c msgid "Adding packfiles to multi-pack-index" msgstr "æ·»åŠ åŒ…æ–‡ä»¶åˆ°å¤šåŒ…ç´¢å¼•" @@ -22394,6 +22619,20 @@ msgid "hash mismatch %s" msgstr "哈希值与 %s ä¸åŒ¹é…" #: pack-bitmap-write.c +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "写入ä½å›¾ç´¢å¼•æ—¶å˜åœ¨é‡å¤æ¡ç›®ï¼š'%s'" + +#: pack-bitmap-write.c +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "å°è¯•å˜å‚¨æœªé€‰å®šçš„æ交：'%s'" + +#: pack-bitmap-write.c +msgid "too many pseudo-merges" +msgstr "太多伪åˆå¹¶" + +#: pack-bitmap-write.c msgid "trying to write commit not in index" msgstr "å°è¯•å†™å…¥æœªåœ¨ç´¢å¼•ä¸çš„æ交" @@ -22423,6 +22662,19 @@ msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "æŸåçš„ä½å›¾ç´¢å¼•ï¼ˆå¤ªå°ï¼Œå®¹ä¸ä¸‹æŸ¥è¯¢è¡¨ï¼‰" #: pack-bitmap.c +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "æŸåçš„ä½å›¾ç´¢å¼•æ–‡ä»¶ï¼ˆå¤ªçŸè€Œæ— 法容纳伪åˆå¹¶è¡¨å¤´ï¼‰" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "æŸåçš„ä½å›¾ç´¢å¼•ï¼ˆå¤ªçŸè€Œæ— 法容纳伪åˆå¹¶è¡¨ï¼‰" + +#: pack-bitmap.c +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "æŸåçš„ä½å›¾ç´¢å¼•ï¼Œä¼ªåˆå¹¶è¡¨è¿‡çŸ" + +#: pack-bitmap.c #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "ä½å›¾ç´¢å¼•ä¸çš„é‡å¤æ¡ç›®ï¼š'%s'" @@ -22537,6 +22789,11 @@ msgstr "ä½å›¾ç»“æžœä¸ä¸€è‡´" #: pack-bitmap.c #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "伪åˆå¹¶ç´¢å¼•è¶…出范围 (%<PRIu32> >= %<PRIuMAX>)" + +#: pack-bitmap.c +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "æ— æ³•åœ¨åŒ… '%2$s' å移 %3$<PRIuMAX> ä¸æ‰¾åˆ° '%1$s'" @@ -22988,6 +23245,10 @@ msgid "unable to parse --pretty format" msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" #: promisor-remote.c +msgid "lazy fetching disabled; some objects may not be available" +msgstr "ç¦ç”¨å»¶è¿ŸèŽ·å–，æŸäº›å¯¹è±¡å¯èƒ½ä¸å¯ç”¨" + +#: promisor-remote.c msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remoteï¼šæ— æ³•æ´¾ç”Ÿ fetch å进程" @@ -23017,6 +23278,72 @@ msgstr "object-info：在å‚数之åŽåº”有一个 flush" msgid "Removing duplicate objects" msgstr "æ£åœ¨åˆ 除é‡å¤å¯¹è±¡" +#: pseudo-merge.c +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "æœªèƒ½åŠ è½½ %s 的伪åˆå¹¶æ£åˆ™è¡¨è¾¾å¼ï¼š'%s'" + +#: pseudo-merge.c +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s 必须为éžè´Ÿæ•´æ•°ï¼Œä½¿ç”¨é»˜è®¤å€¼" + +#: pseudo-merge.c +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s 必须介于 0 到 1 之间，使用默认值" + +#: pseudo-merge.c +#, c-format +msgid "%s must be positive, using default" +msgstr "%s 必须为æ£æ•°ï¼Œä½¿ç”¨é»˜è®¤å€¼" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "伪åˆå¹¶ç»„ '%s' 缺少所需的模å¼" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "伪åˆå¹¶ç»„ '%s' 在稳定阈值之å‰æœ‰ä¸ç¨³å®šé˜ˆå€¼" + +#: pseudo-merge.c +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "æ¥è‡ª config 的伪åˆå¹¶æ£åˆ™è¡¨è¾¾å¼æœ‰å¤ªå¤šçš„æ•èŽ·ç»„（最多 %<PRIuMAX> 个）" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "扩展伪åˆå¹¶è¯»å–越界 (%<PRIuMAX> >= %<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "扩展伪åˆå¹¶æ¡ç›®å¤ªçŸï¼ˆ%<PRIuMAX> >= %<PRIuMAX>）" + +#: pseudo-merge.c +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "æ— æ³•åœ¨æ交 %1$s çš„å移 %2$<PRIuMAX> ä¸æ‰¾åˆ°ä¼ªåˆå¹¶" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "扩展伪åˆå¹¶æŸ¥æ‰¾è¶Šç•Œ (%<PRIu32> >= %<PRIu32>)" + +#: pseudo-merge.c +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "越界读å–：(%<PRIuMAX> >= %<PRIuMAX>)" + +#: pseudo-merge.c +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "æ— æ³•è¯»å–æ交 %s 的扩展伪åˆå¹¶è¡¨" + #: range-diff.c msgid "could not start `log`" msgstr "ä¸èƒ½å¯åŠ¨ `log`" @@ -23726,12 +24053,21 @@ msgid "log for %s is empty" msgstr "%s 的日志为空" #: refs.c +msgid "refusing to force and skip creation of reflog" +msgstr "æ‹’ç»æ—¢å¼ºåˆ¶åˆè·³è¿‡åˆ›å»ºå¼•ç”¨æ—¥å¿—" + +#: refs.c #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "æ‹’ç»æ›´æ–°æœ‰é”™è¯¯å称 '%s' 的引用" #: refs.c #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "æ‹’ç»æ›´æ–°ä¼ªå¼•ç”¨ '%s'" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" @@ -23768,6 +24104,27 @@ msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s：%s" msgid "could not delete references: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ï¼š%s" +#: refs.c +#, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "å·²å®Œæˆ refs 的试è¿è¡Œè¿ç§»ï¼Œç»“æžœå¯åœ¨ '%s' 处找到\n" + +#: refs.c +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶è¿ç§»ç›®å½• '%s'" + +#: refs.c +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "è¿ç§»çš„引用å¯ä»¥åœ¨ '%s' 处找到" + +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "æ— æ³•é”定引用 '%s'ï¼šé¢„æœŸç›®æ ‡ä¸º '%s' 的符å·å¼•ç”¨ï¼šä½†æ˜¯æ˜¯æ™®é€šå¼•ç”¨" + #: refs/reftable-backend.c #, c-format msgid "refname is dangerous: %s" @@ -25159,6 +25516,53 @@ msgstr "update-ref 需è¦ä¸€ä¸ªå®Œæ•´çš„引用å，例如：refs/heads/%s" #: sequencer.c #, c-format +msgid "'%s' does not accept merge commits" +msgstr "'%s' ä¸æŽ¥å—åˆå¹¶æ交" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"'pick' ä¸æŽ¥å—åˆå¹¶æ交。如果您想è¦é‡æ”¾åˆå¹¶ï¼Œ\n" +"请在æ交上使用 'merge -C'。" + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"'reword' ä¸æŽ¥å—åˆå¹¶æ交。如果您想é‡æ”¾åˆå¹¶å¹¶é‡å†™æ交消æ¯ï¼Œ\n" +"请在æ交上使用 'merge -c'" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +#: sequencer.c +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"'editâ€' ä¸æŽ¥å—åˆå¹¶æ交。如果您想è¦é‡æ”¾åˆå¹¶ï¼Œ\n" +"请在æ交上使用 'merge -C'，然åŽä½¿ç”¨ 'break'\n" +"将控制æƒäº¤è¿˜ç»™æ‚¨ï¼Œä»¥ä¾¿æ‚¨å¯ä»¥æ‰§è¡Œ\n" +"'git commit --amend && git rebase --continue'。" + +#: sequencer.c +msgid "cannot squash merge commit into another commit" +msgstr "æ— æ³•å°†åˆå¹¶æ交压缩到å¦ä¸€ä¸ªæ交ä¸" + +#: sequencer.c +#, c-format msgid "invalid command '%.*s'" msgstr "æ— æ•ˆå‘½ä»¤ '%.*s'" @@ -25307,9 +25711,8 @@ msgid "cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: sequencer.c -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "æ— æ³•æ‹·è´ '%s' 至 '%s'" +msgid "could not write commit message file" +msgstr "æ— æ³•å†™å…¥æ交说明文件" #: sequencer.c #, c-format @@ -25788,6 +26191,19 @@ msgid "failed to stat '%*s%s%s'" msgstr "æ— æ³•èŽ·å– '%*s%s%s' 状æ€ï¼ˆstat）" #: setup.c +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"在 '%s' 检测到å¯ç–‘的仓库所有æƒ\n" +"%sè¦ä¸ºæœ¬ä»“库创建特例，请è¿è¡Œï¼š\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#: setup.c msgid "Unable to read current working directory" msgstr "ä¸èƒ½è¯»å–当å‰å·¥ä½œç›®å½•" @@ -25812,19 +26228,6 @@ msgstr "" #: setup.c #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"在 '%s' 检测到å¯ç–‘的仓库所有æƒ\n" -"%sè¦ä¸ºæœ¬ä»“库创建特例，请è¿è¡Œï¼š\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#: setup.c -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" msgstr "æ— æ³•ä½¿ç”¨çº¯ä»“åº“ '%s' （safe.bareRepository 为 '%s'）" @@ -26189,6 +26592,16 @@ msgstr "å模组 git 目录 '%s' ä½äºŽ git 目录 '%.*s' ä¸" #: submodule.c #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "期望å模组的父目录 '%.*s' ä¸æ˜¯ä¸€ä¸ªç¬¦å·é“¾æŽ¥ï¼Œå模组路径为 '%s'" + +#: submodule.c +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "预期å模组路径 '%s' ä¸æ˜¯ç¬¦å·é“¾æŽ¥" + +#: submodule.c +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "ä¸æ”¯æŒå¯¹æœ‰å¤šä¸ªå·¥ä½œåŒºçš„å模组 '%s' 执行 relocate_gitdir" @@ -26233,11 +26646,6 @@ msgid "no remote configured to get bundle URIs from" msgstr "没有远程被设置为å¯ä»¥èŽ·å–归档包 URI" #: t/helper/test-bundle-uri.c -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "远程 '%s' 没有设置 URL" - -#: t/helper/test-bundle-uri.c msgid "could not get the bundle-uri list" msgstr "æ— æ³•èŽ·å– bundle-uri 列表" @@ -28025,29 +28433,29 @@ msgstr "æ— æ³•å‘é€ %s\n" #: git-send-email.perl #, perl-format -msgid "Dry-Sent %s\n" -msgstr "æ¼”ä¹ å‘é€ %s\n" +msgid "Dry-Sent %s" +msgstr "æ¼”ä¹ å‘é€ %s" #: git-send-email.perl #, perl-format -msgid "Sent %s\n" -msgstr "æ£å‘é€ %s\n" +msgid "Sent %s" +msgstr "å·²å‘é€ %s" #: git-send-email.perl -msgid "Dry-OK. Log says:\n" -msgstr "æ¼”ä¹ æˆåŠŸã€‚日志说：\n" +msgid "Dry-OK. Log says:" +msgstr "æ¼”ä¹ æˆåŠŸã€‚日志说：" #: git-send-email.perl -msgid "OK. Log says:\n" -msgstr "OK。日志说：\n" +msgid "OK. Log says:" +msgstr "æˆåŠŸã€‚日志说：" #: git-send-email.perl msgid "Result: " msgstr "结果：" #: git-send-email.perl -msgid "Result: OK\n" -msgstr "结果：OK\n" +msgid "Result: OK" +msgstr "结果：æˆåŠŸ" #: git-send-email.perl #, perl-format diff --git a/po/zh_TW.po b/po/zh_TW.po index f554381a7a..abf7157a99 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -21,14 +21,17 @@ # # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024. # Kaiyang Wu <self@origincode.me>, 2022. -# lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024. +# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024. # Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024. +# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024. +# Nightfeather Chen <slat@nightfeather.me>, 2024. +# hms5232 <hms5232@hhming.moe>, 2024. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-04-28 18:52+0800\n" -"PO-Revision-Date: 2024-04-28 18:44+0800\n" +"POT-Creation-Date: 2024-07-19 15:00+0800\n" +"PO-Revision-Date: 2024-07-24 08:21+0000\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -37,7 +40,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Weblate 5.6.2\n" "X-ZhConverter: ç¹åŒ–姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -69,7 +72,7 @@ msgstr "æ›´æ–°" #: add-interactive.c #, c-format msgid "could not stage '%s'" -msgstr "ç„¡æ³•æš«å˜ â€œ%sâ€" +msgstr "無法暫å˜ã€Œ%sã€" #: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" @@ -89,7 +92,7 @@ msgstr "註：ç¾å·²ä¸å†è¿½è¹¤ %s。\n" #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "å° â€œ%s†路徑執行 make_cache_entry 失敗" +msgstr "å°ã€Œ%sã€è·¯å¾‘執行 make_cache_entry 失敗" #: add-interactive.c msgid "Revert" @@ -125,12 +128,12 @@ msgstr[0] "å·²åŠ å…¥ %d 個路徑\n" msgid "ignoring unmerged: %s" msgstr "忽略未åˆä½µé …目：%s" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "Only binary files changed.\n" msgstr "åªæœ‰äºŒé€²ä½æª”案更動了。\n" -#: add-interactive.c add-patch.c +#: add-interactive.c #, c-format msgid "No changes.\n" msgstr "沒有更動。\n" @@ -543,7 +546,7 @@ msgstr "" #: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" -msgstr "無法解æžå€å¡Šæ¨™é “%.*sâ€" +msgstr "無法解æžå€å¡Šæ¨™é 「%.*sã€" #: add-patch.c msgid "could not parse diff" @@ -556,7 +559,7 @@ msgstr "無法解æžä¸Šè‰²éŽçš„差異" #: add-patch.c #, c-format msgid "failed to run '%s'" -msgstr "無法執行 “%sâ€" +msgstr "無法執行「%sã€" #: add-patch.c msgid "mismatched output from interactive.diffFilter" @@ -625,7 +628,7 @@ msgstr "無法解æžå€å¡Šæ¨™é " #: add-patch.c msgid "'git apply --cached' failed" -msgstr "“git apply --cached†失敗" +msgstr "「git apply --cachedã€å¤±æ•—" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. @@ -636,7 +639,7 @@ msgstr "“git apply --cached†失敗" #: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "未套用您編輯的å€å¡Šã€‚是å¦é‡æ–°ç·¨è¼¯ï¼ˆè¼¸å…¥ “no†æ¨æ£„ï¼ï¼‰ [y/n]? " +msgstr "未套用您編輯的å€å¡Šã€‚是å¦é‡æ–°ç·¨è¼¯ï¼ˆè¼¸å…¥ã€Œnoã€æ¨æ£„ï¼ï¼‰ [y/n]? " #: add-patch.c msgid "The selected hunks do not apply to the index!" @@ -675,6 +678,11 @@ msgstr "" "? - 顯示說明\n" #: add-patch.c +#, c-format +msgid "Only one letter is expected, got '%s'" +msgstr "é 期收到一個å—æ¯ï¼Œå»æ”¶åˆ°ã€Œ%sã€" + +#: add-patch.c msgid "No previous hunk" msgstr "沒有上一個å€å¡Š" @@ -697,7 +705,7 @@ msgstr "跳轉到哪個å€å¡Š? " #: add-patch.c #, c-format msgid "Invalid number: '%s'" -msgstr "無效數å—：“%sâ€" +msgstr "無效數å—：「%sã€" #: add-patch.c #, c-format @@ -736,8 +744,21 @@ msgid "Sorry, cannot edit this hunk" msgstr "å°ä¸èµ·ï¼Œç„¡æ³•ç·¨è¼¯é€™å€‹å€å¡Š" #: add-patch.c +#, c-format +msgid "Unknown command '%s' (use '?' for help)" +msgstr "未知命令「%sã€ï¼ˆä½¿ç”¨ã€Œ?ã€ç²å–幫助）" + +#: add-patch.c msgid "'git apply' failed" -msgstr "“git apply†失敗" +msgstr "「git applyã€å¤±æ•—" + +#: add-patch.c +msgid "No changes." +msgstr "沒有更動。" + +#: add-patch.c +msgid "Only binary files changed." +msgstr "åªæœ‰äºŒé€²ä½æª”案更動了。" #: advice.c #, c-format @@ -746,7 +767,7 @@ msgid "" "Disable this message with \"git config advice.%s false\"" msgstr "" "\n" -"請使用 “git config advice.%s false†åœç”¨æ¤è¨Šæ¯" +"請使用「git config advice.%s falseã€åœç”¨æ¤è¨Šæ¯" #: advice.c #, c-format @@ -782,7 +803,7 @@ msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -"請在工作å€ä¿®æ£æª”案，然後視情æ³ä½¿ç”¨ “git add/rm <file>â€\n" +"請在工作å€ä¿®æ£æª”案，然後視情æ³ä½¿ç”¨ã€Œgit add/rm <file>ã€\n" "命令標記解決方案並æ交。" #: advice.c @@ -866,7 +887,7 @@ msgid "" "false\n" "\n" msgstr "" -"註：切æ›è‡³ “%sâ€ã€‚\n" +"註：切æ›è‡³ã€Œ%sã€ã€‚\n" "\n" "您æ£è™•æ–¼ã€Œåˆ†é›¢ HEADã€ç‹€æ…‹ã€‚您å¯ä»¥æª¢è¦–ã€é€²è¡Œå¯¦é©—性修改並æ交，\n" "而且您å¯ä»¥åœ¨åˆ‡å›žåˆ†æ”¯æ™‚，æ¨æ£„在æ¤ç‹€æ…‹ä¸‹æ‰€åšçš„æ交\n" @@ -901,8 +922,8 @@ msgid "" "* Use \"git sparse-checkout reapply\" to apply the sparsity rules" msgstr "" "è‹¥è¦æ›´æ£é€™äº›è·¯å¾‘的稀ç–狀態，請：\n" -"* 使用 “git add --sparse <路徑†更新索引\n" -"* 使用 “git sparse-checkout reapply†套用稀ç–è¦å‰‡" +"* 使用「git add --sparse <路徑>ã€æ›´æ–°ç´¢å¼•\n" +"* 使用「git sparse-checkout reapplyã€å¥—用稀ç–è¦å‰‡" #: alias.c msgid "cmdline ends with \\" @@ -913,19 +934,19 @@ msgid "unclosed quote" msgstr "未閉åˆçš„引號" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數éŽå¤š" #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" -msgstr "空白å—å…ƒé¸é … “%s†無法è˜åˆ¥" +msgstr "空白å—å…ƒé¸é …「%sã€ç„¡æ³•è˜åˆ¥" #: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "空白å—元忽略é¸é … “%s†無法è˜åˆ¥" +msgstr "空白å—元忽略é¸é …「%sã€ç„¡æ³•è˜åˆ¥" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c #: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c @@ -939,12 +960,12 @@ msgstr "空白å—元忽略é¸é … “%s†無法è˜åˆ¥" #: range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" -msgstr "無法åŒæ™‚使用 “%s†和 “%s†é¸é …" +msgstr "無法åŒæ™‚使用「%sã€å’Œã€Œ%sã€é¸é …" #: apply.c #, c-format msgid "'%s' outside a repository" -msgstr "“%s†在版本庫之外" +msgstr "「%sã€åœ¨ç‰ˆæœ¬åº«ä¹‹å¤–" #: apply.c msgid "failed to read patch" @@ -1080,7 +1101,7 @@ msgstr "ç„¡æ³•é–‹å•Ÿæˆ–è®€å– %s" #: apply.c #, c-format msgid "invalid start of line: '%c'" -msgstr "無效的列首å—元：“%câ€" +msgstr "無效的列首å—元：「%cã€" #: apply.c #, c-format @@ -1105,43 +1126,43 @@ msgstr "" #: apply.c #, c-format msgid "missing binary patch data for '%s'" -msgstr "缺少 “%s†的二進ä½ä¿®è£œæª”資料" +msgstr "缺少「%sã€çš„二進ä½ä¿®è£œæª”資料" #: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "無法åå‘套用一個缺少至 “%s†的åå‘資料å€å¡Šçš„二進ä½ä¿®è£œæª”" +msgstr "無法åå‘套用一個缺少至「%sã€çš„åå‘資料å€å¡Šçš„二進ä½ä¿®è£œæª”" #: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "無法在 “%s†上套用沒有完整索引列的二進ä½ä¿®è£œæª”" +msgstr "無法在「%sã€ä¸Šå¥—用沒有完整索引列的二進ä½ä¿®è£œæª”" #: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "修補檔è¦å¥—用到 “%sâ€ï¼ˆ%s），但與目å‰å…§å®¹ä¸ç¬¦ã€‚" +msgstr "修補檔è¦å¥—用到「%sã€ï¼ˆ%s），但與目å‰å…§å®¹ä¸ç¬¦ã€‚" #: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "修補檔è¦å¥—用至空檔案 “%sâ€ï¼Œä½†å…¶éžç©ºæª”案" +msgstr "修補檔è¦å¥—用至空檔案「%sã€ï¼Œä½†å…¶éžç©ºæª”案" #: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "ç„¡æ³•è®€å– â€œ%2$sâ€ å¿…é ˆçš„ç›®æ¨™æª”æ¡ˆ %1$s" +msgstr "無法讀å–「%2$sã€å¿…é ˆçš„ç›®æ¨™æª”æ¡ˆ %1$s" #: apply.c #, c-format msgid "binary patch does not apply to '%s'" -msgstr "二進ä½ä¿®è£œæª”未套用到 “%sâ€" +msgstr "二進ä½ä¿®è£œæª”未套用到「%sã€" #: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "修補 “%s†的二進ä½ä¿®è£œæª”，產生了ä¸æ£ç¢ºçš„çµæžœï¼ˆé 期 %s，å»ç‚º %s）" +msgstr "修補「%sã€çš„二進ä½ä¿®è£œæª”，產生了ä¸æ£ç¢ºçš„çµæžœï¼ˆé 期 %s，å»ç‚º %s）" #: apply.c #, c-format @@ -1161,7 +1182,7 @@ msgstr "ç„¡æ³•è®€å– %s" #: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" -msgstr "讀å–符號連çµèƒŒå¾Œçš„ “%sâ€" +msgstr "讀å–符號連çµèƒŒå¾Œçš„「%sã€" #: apply.c #, c-format @@ -1190,7 +1211,7 @@ msgstr "æ£åœ¨é€²è¡Œä¸‰æ–¹åˆä½µâ€¦â€¦\n" #: apply.c #, c-format msgid "cannot read the current contents of '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%s†目å‰çš„內容" +msgstr "無法讀å–「%sã€ç›®å‰çš„內容" #: apply.c #, c-format @@ -1200,12 +1221,12 @@ msgstr "無法進行三方åˆä½µâ€¦â€¦\n" #: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" -msgstr "å·²å¥—ç”¨å° â€œ%s†的修補檔，但有è¡çªã€‚\n" +msgstr "已套用å°ã€Œ%sã€çš„修補檔，但有è¡çªã€‚\n" #: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" -msgstr "å·²å®Œå…¨å¥—ç”¨å° â€œ%s†的修補檔。\n" +msgstr "已完全套用å°ã€Œ%sã€çš„修補檔。\n" #: apply.c #, c-format @@ -1229,7 +1250,7 @@ msgstr "%s 的類型是 %o，é 期是 %o" #: apply.c read-cache.c #, c-format msgid "invalid path '%s'" -msgstr "路徑 “%s†無效" +msgstr "路徑「%sã€ç„¡æ•ˆ" #: apply.c #, c-format @@ -1254,7 +1275,7 @@ msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和 %4$s 的舊模å¼ï¼ˆ%3$o）ä¸ç¬¦" #: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" -msgstr "å—影響的檔案 “%s†在符號連çµå¾Œ" +msgstr "å—影響的檔案「%sã€åœ¨ç¬¦è™Ÿé€£çµå¾Œ" #: apply.c #, c-format @@ -1304,7 +1325,7 @@ msgstr "修補 %s å模組的修補檔æ壞" #: apply.c #, c-format msgid "unable to stat newly created file '%s'" -msgstr "無法å°å‰›å»ºç«‹çš„檔案 “%s†執行 stat" +msgstr "無法å°å‰›å»ºç«‹çš„檔案「%sã€åŸ·è¡Œ stat" #: apply.c #, c-format @@ -1319,17 +1340,17 @@ msgstr "無法為 %s åŠ å…¥å¿«å–é …ç›®" #: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" -msgstr "無法寫入 “%sâ€" +msgstr "無法寫入「%sã€" #: apply.c #, c-format msgid "closing file '%s'" -msgstr "關閉檔案 “%sâ€" +msgstr "關閉檔案「%sã€" #: apply.c #, c-format msgid "unable to write file '%s' mode %o" -msgstr "ç„¡æ³•ä»¥æ¨¡å¼ %2$o 寫入 “%1$s†檔案" +msgstr "ç„¡æ³•ä»¥æ¨¡å¼ %2$o 寫入「%1$sã€æª”案" #: apply.c #, c-format @@ -1354,7 +1375,7 @@ msgstr "無法開啟 %s" #: apply.c rerere.c #, c-format msgid "cannot unlink '%s'" -msgstr "無法刪除 “%sâ€" +msgstr "無法刪除「%sã€" #: apply.c #, c-format @@ -1369,11 +1390,11 @@ msgstr "拒絕第 #%d 個å€å¡Šã€‚" #: apply.c #, c-format msgid "Skipped patch '%s'." -msgstr "ç•¥éŽä¿®è£œæª” “%sâ€ã€‚" +msgstr "ç•¥éŽä¿®è£œæª”「%sã€ã€‚" #: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" -msgstr "輸入沒有有效的修補檔內容（傳入 “--allow-empty†å…許æ¤è¡Œç‚ºï¼‰" +msgstr "輸入沒有有效的修補檔內容（傳入「--allow-emptyã€å…許æ¤è¡Œç‚ºï¼‰" #: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" @@ -1382,7 +1403,7 @@ msgstr "無法讀å–索引檔案" #: apply.c #, c-format msgid "can't open patch '%s': %s" -msgstr "無法開啟修補檔 “%sâ€ï¼š%s" +msgstr "無法開啟修補檔「%sã€ï¼š%s" #: apply.c #, c-format @@ -1545,7 +1566,7 @@ msgstr "壓縮錯誤 (%d)" #: archive-tar.c #, c-format msgid "unable to start '%s' filter" -msgstr "無法啟動 “%s†éŽæ¿¾å™¨" +msgstr "無法啟動「%sã€éŽæ¿¾å™¨" #: archive-tar.c msgid "unable to redirect descriptor" @@ -1554,7 +1575,7 @@ msgstr "無法é‡æ–°å°Žå‘æè¿°å…ƒ" #: archive-tar.c #, c-format msgid "'%s' filter reported error" -msgstr "“%s†éŽæ¿¾å™¨å›žå ±éŒ¯èª¤" +msgstr "「%sã€éŽæ¿¾å™¨å›žå ±éŒ¯èª¤" #: archive-zip.c #, c-format @@ -1588,17 +1609,17 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list" #: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%sâ€" +msgstr "無法讀å–「%sã€" #: archive.c #, c-format msgid "pathspec '%s' matches files outside the current directory" -msgstr "符åˆè·¯å¾‘è¦æ ¼ “%s†的檔案在目å‰ç›®éŒ„之外" +msgstr "符åˆè·¯å¾‘è¦æ ¼ã€Œ%sã€çš„檔案在目å‰ç›®éŒ„之外" #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" -msgstr "路徑è¦æ ¼ “%s†未符åˆä»»ä½•æª”案" +msgstr "路徑è¦æ ¼ã€Œ%sã€æœªç¬¦åˆä»»ä½•æª”案" #: archive.c #, c-format @@ -1628,17 +1649,17 @@ msgstr "ä¸æ˜¯ä¸€èˆ¬æª”案：%s" #: archive.c #, c-format msgid "unclosed quote: '%s'" -msgstr "未閉åˆçš„引號：“%sâ€" +msgstr "未閉åˆçš„引號：「%sã€" #: archive.c #, c-format msgid "missing colon: '%s'" -msgstr "缺少冒號：“%sâ€" +msgstr "缺少冒號：「%sã€" #: archive.c #, c-format msgid "empty file name: '%s'" -msgstr "檔案å稱空白：“%sâ€" +msgstr "檔案å稱空白：「%sã€" #: archive.c msgid "fmt" @@ -1725,7 +1746,7 @@ msgstr "éžé 期é¸é … --remote" #: revision.c #, c-format msgid "the option '%s' requires '%s'" -msgstr "“%s†é¸é …éœ€è¦ â€œ%sâ€" +msgstr "「%sã€é¸é …需è¦ã€Œ%sã€" #: archive.c msgid "Unexpected option --output" @@ -1734,17 +1755,17 @@ msgstr "éžé 期é¸é … --output" #: archive.c #, c-format msgid "extra command line parameter '%s'" -msgstr "多出命令列åƒæ•¸ “%sâ€" +msgstr "多出命令列åƒæ•¸ã€Œ%sã€" #: archive.c #, c-format msgid "Unknown archive format '%s'" -msgstr "å°å˜æ ¼å¼ “%s†未知" +msgstr "å°å˜æ ¼å¼ã€Œ%sã€æœªçŸ¥" #: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" -msgstr "引數ä¸æ”¯æ´ “%sâ€ æ ¼å¼ï¼š-%d" +msgstr "引數ä¸æ”¯æ´ã€Œ%sã€æ ¼å¼ï¼š-%d" #: attr.c #, c-format @@ -1771,22 +1792,26 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" "git attributes 會忽略åå‘模å¼\n" -"當å—串確定è¦ä»¥é©šå˜†è™Ÿé–‹å§‹æ™‚，請使用 “\\!â€ã€‚" +"當å—串確定è¦ä»¥é©šå˜†è™Ÿé–‹å§‹æ™‚，請使用「\\!ã€ã€‚" #: attr.c #, c-format msgid "cannot fstat gitattributes file '%s'" -msgstr "無法 fstat gitattributes 檔案 “%sâ€" +msgstr "無法 fstat gitattributes 檔案「%sã€" #: attr.c #, c-format msgid "ignoring overly large gitattributes file '%s'" -msgstr "忽略éŽå¤§çš„ gitattributes 檔案 “%sâ€" +msgstr "忽略éŽå¤§çš„ gitattributes 檔案「%sã€" #: attr.c #, c-format msgid "ignoring overly large gitattributes blob '%s'" -msgstr "忽略éŽå¤§çš„ gitattributes 資料物件 “%sâ€" +msgstr "忽略éŽå¤§çš„ gitattributes 資料物件「%sã€" + +#: attr.c +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo" +msgstr "沒有版本庫無法使用 --attr-source 或 GIT_ATTR_SOURCE" #: attr.c msgid "bad --attr-source or GIT_ATTR_SOURCE" @@ -1795,18 +1820,18 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" #: attr.c read-cache.c #, c-format msgid "unable to stat '%s'" -msgstr "ç„¡æ³•å° %s 執行 stat" +msgstr "無法統計「%sã€" #: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c #: builtin/pack-objects.c combine-diff.c rerere.c #, c-format msgid "unable to read %s" -msgstr "ä¸èƒ½è®€ %s" +msgstr "ç„¡æ³•è®€å– %s" #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" -msgstr "檔案 “%s†包å«ç„¡æ•ˆçš„引用內容：%s" +msgstr "檔案「%sã€åŒ…å«ç„¡æ•ˆçš„引用內容：%s" #: bisect.c #, c-format @@ -1843,7 +1868,7 @@ msgid "" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" "åˆä½µåŸºç¤Ž %s 是 %s。\n" -"這æ„味著第一個 “%s†æ交ä½æ–¼ %s å’Œ [%s] 之間。\n" +"這æ„味著第一個「%sã€æ交ä½æ–¼ %s å’Œ [%s] 之間。\n" #: bisect.c #, c-format @@ -1880,17 +1905,17 @@ msgstr "需è¦ä¸€å€‹ %s 修訂版" #: bisect.c #, c-format msgid "could not create file '%s'" -msgstr "無法建立 “%s†檔案" +msgstr "無法建立「%sã€æª”案" #: bisect.c builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "ä¸èƒ½ç‚ºç‰©ä»¶ '%s' 開始 'show'" +msgstr "無法為物件「%sã€é–‹å§‹ã€Œshowã€" #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%s†檔案" +msgstr "無法讀å–「%sã€æª”案" #: bisect.c msgid "reading bisect refs failed" @@ -1963,22 +1988,22 @@ msgstr "請求é‡å®šåŸºåº•æ™‚，無法繼承多個引用的上游追蹤è¨å®š" #: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" -msgstr "未將 “%s†分支è¨ç‚ºå…¶è‡ªå·±çš„上游" +msgstr "未將「%sã€åˆ†æ”¯è¨ç‚ºå…¶è‡ªå·±çš„上游" #: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." -msgstr "已藉由é‡è¨‚基底，將 “%s†分支è¨å®šç‚ºè¿½è¹¤ “%sâ€ã€‚" +msgstr "已藉由é‡è¨‚基底，將「%sã€åˆ†æ”¯è¨å®šç‚ºè¿½è¹¤ã€Œ%sã€ã€‚" #: branch.c #, c-format msgid "branch '%s' set up to track '%s'." -msgstr "已將 “%s†分支è¨å®šç‚ºè¿½è¹¤ “%sâ€ã€‚" +msgstr "已將「%sã€åˆ†æ”¯è¨å®šç‚ºè¿½è¹¤ã€Œ%sã€ã€‚" #: branch.c #, c-format msgid "branch '%s' set up to track:" -msgstr "“%s†分支已è¨å®šè¿½è¹¤ï¼š" +msgstr "「%sã€åˆ†æ”¯å·²è¨å®šè¿½è¹¤ï¼š" #: branch.c msgid "unable to write upstream branch configuration" @@ -1997,17 +2022,17 @@ msgstr "" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" -msgstr "請求繼承 “%s†的追蹤è¨å®šï¼Œä½†æœªè¨å®šé 端" +msgstr "請求繼承「%sã€çš„追蹤è¨å®šï¼Œä½†æœªè¨å®šé 端" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" -msgstr "請求繼承 “%s†的追蹤è¨å®šï¼Œä½†æœªè¨å®šåˆä½µè¨å®š" +msgstr "請求繼承「%sã€çš„追蹤è¨å®šï¼Œä½†æœªè¨å®šåˆä½µè¨å®š" #: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" -msgstr "未追蹤：“%s†引用有æ§ç¾©" +msgstr "未追蹤：「%sã€å¼•ç”¨æœ‰æ§ç¾©" # è¯è€…：為ä¿è‰åœ¨è¼¸å‡ºä¸å°é½Šï¼Œæ³¨æ„調整å¥ä¸ç©ºæ ¼ï¼ #. #-#-#-#-# branch.c.po #-#-#-#-# @@ -2042,7 +2067,7 @@ msgid "" "tracking namespaces." msgstr "" "有多個é 端的抓å–引用è¦æ ¼ï¼Œæ˜ 射到\n" -"é 端追蹤引用 “%s†的è¦æ ¼ï¼š\n" +"é 端追蹤引用「%sã€çš„è¦æ ¼ï¼š\n" "%s\n" "這通常是è¨å®šéŒ¯èª¤ã€‚\n" "\n" @@ -2052,7 +2077,7 @@ msgstr "" #: branch.c #, c-format msgid "'%s' is not a valid branch name" -msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„分支å稱" +msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆçš„分支å稱" #: branch.c builtin/branch.c msgid "See `man git check-ref-format`" @@ -2061,22 +2086,22 @@ msgstr "è«‹åƒé–±ã€Œman git check-ref-formatã€" #: branch.c #, c-format msgid "a branch named '%s' already exists" -msgstr "已有åŒå “%s†分支" +msgstr "已有åŒå「%sã€åˆ†æ”¯" #: branch.c #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" -msgstr "無法強制更新被ä½æ–¼ “%2$s†的工作å€ä½¿ç”¨çš„ “%1$s†分支" +msgstr "無法強制更新被ä½æ–¼ã€Œ%2$sã€çš„工作å€ä½¿ç”¨çš„分支「%1$sã€" #: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" -msgstr "無法è¨å®šè¿½è¹¤è³‡è¨Šï¼šèµ·å§‹é»ž “%s†ä¸æ˜¯åˆ†æ”¯" +msgstr "無法è¨å®šè¿½è¹¤è³‡è¨Šï¼šèµ·å§‹é»žã€Œ%sã€ä¸æ˜¯åˆ†æ”¯" #: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" -msgstr "請求的上游分支 “%s†ä¸å˜åœ¨" +msgstr "請求的上游分支「%sã€ä¸å˜åœ¨" #: branch.c msgid "" @@ -2100,22 +2125,22 @@ msgstr "" #: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" -msgstr "物件å稱無效：“%sâ€" +msgstr "物件å稱無效：「%sã€" #: branch.c #, c-format msgid "ambiguous object name: '%s'" -msgstr "物件å稱有æ§ç¾©ï¼šâ€œ%sâ€" +msgstr "物件å稱有æ§ç¾©ï¼šã€Œ%sã€" #: branch.c #, c-format msgid "not a valid branch point: '%s'" -msgstr "分支點無效：“%sâ€" +msgstr "分支點無效：「%sã€" #: branch.c #, c-format msgid "submodule '%s': unable to find submodule" -msgstr "“%s†å模組：找ä¸åˆ°å模組" +msgstr "「%sã€å模組：找ä¸åˆ°å模組" #: branch.c #, c-format @@ -2123,18 +2148,18 @@ msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" "submodules %s && git submodule update --init'" msgstr "" -"您å¯ä»¥ä½¿ç”¨ “git checkout --no-recurse-submodules %s && git submodule update " -"--init†命令嘗試更新å模組" +"您å¯ä»¥ä½¿ç”¨ã€Œgit checkout --no-recurse-submodules %s && git submodule update " +"--initã€å‘½ä»¤å˜—試更新å模組" #: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" -msgstr "“%s†å模組：無法建立 “%s†分支" +msgstr "「%sã€å模組：無法建立「%sã€åˆ†æ”¯" #: branch.c #, c-format msgid "'%s' is already used by worktree at '%s'" -msgstr "“%s†已被ä½æ–¼ “%s†的工作å€ä½¿ç”¨" +msgstr "「%sã€å·²è¢«ä½æ–¼ã€Œ%sã€çš„工作å€ä½¿ç”¨" #: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." @@ -2150,14 +2175,6 @@ msgid "Unstaged changes after refreshing the index:" msgstr "é‡æ–°æ•´ç†ç´¢å¼•ä¹‹å¾Œï¼Œå°šæœªè¢«æš«å˜çš„更動：" #: builtin/add.c -msgid "" -"the add.interactive.useBuiltin setting has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"add.interactive.useBuiltin è¨å®šå·²è¢«ç§»é™¤ï¼\n" -"深入了解請åƒé–± “git help config†ä¸çš„å°æ‡‰æ¢ç›®ã€‚" - -#: builtin/add.c msgid "could not read the index" msgstr "無法讀å–索引" @@ -2168,7 +2185,7 @@ msgstr "編輯修補檔失敗" #: builtin/add.c read-cache.c #, c-format msgid "could not stat '%s'" -msgstr "ä¸èƒ½å° '%s' å‘¼å« stat" +msgstr "無法統計「%sã€" #: builtin/add.c msgid "empty patch. aborted" @@ -2177,7 +2194,7 @@ msgstr "修補檔空白。ä¸æ¢" #: builtin/add.c #, c-format msgid "could not apply '%s'" -msgstr "無法套用 “%sâ€" +msgstr "無法套用「%sã€" #: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" @@ -2284,7 +2301,7 @@ msgstr "" "\n" "\tgit rm --cached %s\n" "\n" -"åƒè¦‹ “git help submodule†深入了解。" +"åƒè¦‹ã€Œgit help submoduleã€æ·±å…¥äº†è§£ã€‚" #: builtin/add.c #, c-format @@ -2293,7 +2310,7 @@ msgstr "æ£åœ¨åŠ å…¥åµŒå…¥å¼ git 版本庫：%s" #: builtin/add.c msgid "Use -f if you really want to add them." -msgstr "如果您確定想è¦åŠ 入他們，請使用「-fã€ã€‚" +msgstr "如果您確定想è¦åŠ 入它們，請使用 -f。" #: builtin/add.c msgid "adding files failed" @@ -2302,13 +2319,13 @@ msgstr "åŠ å…¥æª”æ¡ˆå¤±æ•—" #: builtin/add.c #, c-format msgid "--chmod param '%s' must be either -x or +x" -msgstr "--chmod çš„åƒæ•¸ “%sâ€ å¿…é ˆæ˜¯ -x 或 +x" +msgstr "--chmod çš„åƒæ•¸ã€Œ%sã€å¿…é ˆæ˜¯ -x 或 +x" #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c #: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" -msgstr "“%s†和路徑è¦æ ¼å¼•æ•¸ä¸å¾—åŒæ™‚使用" +msgstr "「%sã€å’Œè·¯å¾‘è¦æ ¼å¼•æ•¸ä¸å¾—åŒæ™‚使用" #: builtin/add.c #, c-format @@ -2334,19 +2351,19 @@ msgstr "無法寫入新的索引檔案" #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" -msgstr "“%sâ€ å‹•ä½œå° â€œ%s†無效" +msgstr "「%sã€å‹•ä½œå°ã€Œ%sã€ç„¡æ•ˆ" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c #: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c #: ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" -msgstr "“%s†的值無效：“%sâ€" +msgstr "「%sã€çš„值無效：「%sã€" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%sâ€" +msgstr "無法讀å–「%sã€" #: builtin/am.c msgid "could not parse author script" @@ -2360,17 +2377,17 @@ msgstr "ç„¡æ³•è§£æž %s" #: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" -msgstr "“%s†被 applypatch-msg 掛鉤刪除" +msgstr "「%sã€è¢« applypatch-msg 掛鉤刪除" #: builtin/am.c #, c-format msgid "Malformed input line: '%s'." -msgstr "æ ¼å¼éŒ¯èª¤çš„輸入列：“%sâ€ã€‚" +msgstr "æ ¼å¼éŒ¯èª¤çš„輸入列：「%sã€ã€‚" #: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" -msgstr "從 “%s†拷è²è¨»è§£åˆ° “%s†失敗" +msgstr "從「%sã€æ‹·è²è¨»è§£åˆ°ã€Œ%sã€å¤±æ•—" #: builtin/am.c msgid "fseek failed" @@ -2379,17 +2396,17 @@ msgstr "fseek 失敗" #: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" -msgstr "無法開啟 “%s†進行讀å–" +msgstr "無法開啟「%sã€é€²è¡Œè®€å–" #: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" -msgstr "無法開啟 “%s†進行寫入" +msgstr "無法開啟「%sã€é€²è¡Œå¯«å…¥" #: builtin/am.c #, c-format msgid "could not parse patch '%s'" -msgstr "無法解æžä¿®è£œæª” “%sâ€" +msgstr "無法解æžä¿®è£œæª”「%sã€" #: builtin/am.c msgid "Only one StGIT patch series can be applied at once" @@ -2414,7 +2431,7 @@ msgstr "ä¿®è£œæª”æ ¼å¼åµæ¸¬å¤±æ•—。" #: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" -msgstr "無法建立目錄 “%sâ€" +msgstr "無法建立目錄「%sã€" #: builtin/am.c msgid "Failed to split patches." @@ -2439,7 +2456,7 @@ msgstr "è‹¥è¦å°‡ç©ºç™½ä¿®è£œæª”錄入為空白æ交，請執行「%s --allow-e #: builtin/am.c #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "è‹¥è¦é‚„原至原始分支，並åœæ¢ä¿®è£œå‹•ä½œï¼Œè«‹åŸ·è¡Œ “%s --abortâ€ã€‚" +msgstr "è‹¥è¦é‚„原至原始分支，並åœæ¢ä¿®è£œå‹•ä½œï¼Œè«‹åŸ·è¡Œã€Œ%s --abortã€ã€‚" #: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." @@ -2554,7 +2571,7 @@ msgstr "在 %s %.*s 處修補失敗" #: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "使用 “git am --show-current-patch=diff†命令檢視失敗的修補檔" +msgstr "使用「git am --show-current-patch=diffã€å‘½ä»¤æª¢è¦–失敗的修補檔" #: builtin/am.c msgid "No changes - recorded it as an empty commit." @@ -2566,7 +2583,7 @@ msgid "" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"沒有變更：是å¦å¿˜è¨˜åŸ·è¡Œ “git addâ€ï¼Ÿ\n" +"沒有變更：是å¦å¿˜è¨˜åŸ·è¡Œã€Œgit addã€ï¼Ÿ\n" "如果沒有其他è¦æ–°å¢žåˆ°æš«å˜å€çš„，則很å¯èƒ½æ˜¯å…¶å®ƒæ交\n" "已經引入了相åŒçš„變更。您也許想è¦ç•¥éŽé€™å€‹ä¿®è£œæª”。" @@ -2584,7 +2601,7 @@ msgstr "" #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." -msgstr "ç„¡æ³•è§£æž â€œ%s†物件。" +msgstr "無法解æžã€Œ%sã€ç‰©ä»¶ã€‚" #: builtin/am.c msgid "failed to clean index" @@ -2595,13 +2612,13 @@ msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -"您似乎在上一次 “am†失敗後移動了 HEAD。\n" +"您似乎在上一次「amã€å¤±æ•—後移動了 HEAD。\n" "未倒轉回 ORIG_HEAD" -#: builtin/am.c builtin/bisect.c worktree.c +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c #, c-format msgid "failed to read '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%sâ€" +msgstr "無法讀å–「%sã€" #: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" @@ -2676,8 +2693,8 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c +#: builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "format" @@ -2714,6 +2731,10 @@ msgid "show the patch being applied" msgstr "顯示æ£åœ¨å¥—用的修補檔" #: builtin/am.c +msgid "try to apply current patch again" +msgstr "å†æ¬¡å˜—試套用目å‰ä¿®è£œæª”" + +#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "將空白修補檔錄入為空白æ交" @@ -2766,7 +2787,7 @@ msgid "" "Use \"git am --abort\" to remove it." msgstr "" "發ç¾å¤±æ•£çš„ %s 目錄。\n" -"使用 “git am --abort†移除。" +"使用「git am --abortã€ç§»é™¤ã€‚" #: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." @@ -2785,10 +2806,6 @@ msgid "could not redirect output" msgstr "無法é‡æ–°å°Žå‘輸出" #: builtin/archive.c -msgid "git archive: Remote with no URL" -msgstr "git archive: 未æä¾›é 端 URL" - -#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：é 期是 ACK/NAK，å»æ”¶åˆ° flush å°åŒ…" @@ -2836,32 +2853,32 @@ msgstr "git bisect run <cmd> [<arg>...]" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "無法以 “%2$s†模å¼é–‹å•Ÿ “%1$s†檔案" +msgstr "無法以「%2$sã€æ¨¡å¼é–‹å•Ÿã€Œ%1$sã€æª”案" #: builtin/bisect.c #, c-format msgid "could not write to file '%s'" -msgstr "無法寫入 “%s†檔案" +msgstr "無法寫入「%sã€æª”案" #: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" -msgstr "無法開啟 “%s†檔案進行讀å–" +msgstr "無法開啟「%sã€æª”案進行讀å–" #: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" -msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆè¡“語" +msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆè¡“語" #: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "ä¸èƒ½å°‡å…§å»ºå‘½ä»¤ “%s†當作術語使用" +msgstr "ä¸èƒ½å°‡å…§å»ºå‘½ä»¤ã€Œ%sã€ç•¶ä½œè¡“語使用" #: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "ä¸èƒ½è®Šæ›´è¡“語 “%s†的å«ç¾©" +msgstr "ä¸èƒ½è®Šæ›´è¡“語「%sã€çš„å«ç¾©" #: builtin/bisect.c msgid "please use two different terms" @@ -2875,13 +2892,13 @@ msgstr "我們沒有在二分æœå°‹ã€‚\n" #: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" -msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„æ交" +msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆçš„æ交" #: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "ä¸èƒ½ç°½å‡ºåŽŸå§‹ HEAD “%sâ€ã€‚請嘗試 “git bisect reset <commit>â€ã€‚" +msgstr "ä¸èƒ½ç°½å‡ºåŽŸå§‹ HEAD「%sã€ã€‚請嘗試「git bisect reset <commit>ã€ã€‚" #: builtin/bisect.c #, c-format @@ -2891,12 +2908,12 @@ msgstr "bisect_write 引數無效：%s" #: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "無法å–得修訂版 “%s†的物件 ID" +msgstr "無法å–得修訂版「%sã€çš„物件 ID" #: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" -msgstr "無法開啟檔案 “%sâ€" +msgstr "無法開啟檔案「%sã€" #: builtin/bisect.c #, c-format @@ -2910,7 +2927,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "需指定至少一個 %s 和一個 %s 修訂版。\n" -"為æ¤æ‚¨å¯ä»¥ç”¨ “git bisect %s†和 “git bisect %sâ€ã€‚" +"為æ¤æ‚¨å¯ä»¥ç”¨ã€Œgit bisect %sã€å’Œã€Œgit bisect %sã€ã€‚" #: builtin/bisect.c #, c-format @@ -2919,9 +2936,9 @@ msgid "" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œ “git bisect startâ€ã€‚\n" +"è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œã€Œgit bisect startã€ã€‚\n" "接著æ供至少一個 %s 和一個 %s 修訂版。\n" -"為æ¤æ‚¨å¯ä»¥ç”¨ “git bisect %s†和 “git bisect %sâ€ã€‚" +"為æ¤æ‚¨å¯ä»¥ç”¨ã€Œgit bisect %sã€å’Œã€Œgit bisect %sã€ã€‚" #: builtin/bisect.c #, c-format @@ -2970,7 +2987,7 @@ msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -"傳入 “git bisect terms†的 %s 引數無效。\n" +"傳入「git bisect termsã€çš„ %s 引數無效。\n" "支æ´çš„é¸é …有：--term-good|--term-old å’Œ --term-bad|--term-new。" #: builtin/bisect.c @@ -2980,21 +2997,21 @@ msgstr "修訂版éæ·è¨å®šå¤±æ•—\n" #: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" -msgstr "無法開啟 “%sâ€ é€²è¡Œé™„åŠ " +msgstr "無法開啟「%sã€é€²è¡Œé™„åŠ " #: builtin/bisect.c msgid "'' is not a valid term" -msgstr "“ †ä¸æ˜¯æœ‰æ•ˆè¡“語" +msgstr "「 ã€ä¸æ˜¯æœ‰æ•ˆè¡“語" #: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" -msgstr "無法è˜åˆ¥é¸é …：“%sâ€" +msgstr "無法è˜åˆ¥é¸é …：「%sã€" #: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "“%s†似乎ä¸æ˜¯æœ‰æ•ˆä¿®è¨‚版" +msgstr "「%sã€ä¼¼ä¹Žä¸æ˜¯æœ‰æ•ˆä¿®è¨‚版" #: builtin/bisect.c msgid "bad HEAD - I need a HEAD" @@ -3003,7 +3020,7 @@ msgstr "HEAD 無效 — 需è¦ä¸€å€‹ HEAD" #: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "簽出 “%s†失敗。請嘗試 “git bisect start <valid-branch>â€ã€‚" +msgstr "簽出「%sã€å¤±æ•—。請嘗試「git bisect start <valid-branch>ã€ã€‚" #: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" @@ -3012,11 +3029,11 @@ msgstr "HEAD 無效 — 異常符號引用" #: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" -msgstr "引用無效：“%sâ€" +msgstr "引用無效：「%sã€" #: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" -msgstr "è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œ “git bisect startâ€\n" +msgstr "è¦é–‹å§‹ï¼Œè«‹åŸ·è¡Œã€Œgit bisect startã€\n" # è¯è€…：請ç¶æŒå¥å°¾ç©ºæ ¼ #. TRANSLATORS: Make sure to include [Y] and [n] in your @@ -3034,7 +3051,7 @@ msgstr "è¦å‘¼å« `--bisect-state`，請傳入一個以上的引數" #: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." -msgstr "“git bisect %s†åªå–一個引數。" +msgstr "「git bisect %sã€åªå–一個引數。" #: builtin/bisect.c #, c-format @@ -3087,7 +3104,7 @@ msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：%2$s 回傳的çµæŸä»£ç¢¼ %1$d å°æ–¼ 0 或å #: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" -msgstr "無法開啟 “%s†檔案進行寫入" +msgstr "無法開啟「%sã€æª”案進行寫入" #: builtin/bisect.c msgid "bisect run cannot continue any more" @@ -3104,22 +3121,22 @@ msgstr "二分æœå°‹ç™¼ç¾åˆ°ç¬¬ä¸€å€‹æœ‰å•é¡Œçš„æ交" #: builtin/bisect.c #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" -msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：“git bisect %s†以錯誤碼 %d 離開" +msgstr "二分æœå°‹åŸ·è¡Œå¤±æ•—：「git bisect %sã€ä»¥éŒ¯èª¤ç¢¼ %d 離開" #: builtin/bisect.c #, c-format msgid "'%s' requires either no argument or a commit" -msgstr "“%s†ä¸éœ€è¦å¼•æ•¸ï¼Œæˆ–者得傳入一個æ交" +msgstr "「%sã€ä¸éœ€è¦å¼•æ•¸ï¼Œæˆ–者得傳入一個æ交" #: builtin/bisect.c #, c-format msgid "'%s' requires 0 or 1 argument" -msgstr "“%sâ€ éœ€è¦ 0 或 1 個引數" +msgstr "「%sã€éœ€è¦ 0 或 1 個引數" #: builtin/bisect.c #, c-format msgid "'%s' requires 0 arguments" -msgstr "“%s†ä¸éœ€å¼•æ•¸" +msgstr "「%sã€ä¸éœ€å¼•æ•¸" #: builtin/bisect.c msgid "no logfile given" @@ -3128,7 +3145,7 @@ msgstr "未æ供日誌檔案" #: builtin/bisect.c #, c-format msgid "'%s' failed: no command provided." -msgstr "“%s†失敗：沒有æ供命令。" +msgstr "「%sã€å¤±æ•—：沒有æ供命令。" #: builtin/bisect.c msgid "need a command" @@ -3137,7 +3154,7 @@ msgstr "需è¦æ供命令" #: builtin/bisect.c builtin/cat-file.c #, c-format msgid "unknown command: '%s'" -msgstr "未知命令：“%sâ€" +msgstr "未知命令：「%sã€" #: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -3352,8 +3369,8 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD" msgstr "" -"å°‡è¦åˆªé™¤çš„ “%s†分支已經被åˆä½µåˆ°\n" -" “%sâ€ï¼Œä½†å°šæœªåˆä½µåˆ° HEAD" +"å°‡è¦åˆªé™¤çš„分支「%sã€å·²ç¶“被åˆä½µåˆ°\n" +" 「%sã€ï¼Œä½†å°šæœªåˆä½µåˆ° HEAD" # è¯è€…：ä¿æŒåŽŸæ›è¡Œæ ¼å¼ï¼Œåœ¨è¼¸å‡ºæ™‚ %s 的替代內容會讓å—串變長 #: builtin/branch.c @@ -3362,23 +3379,23 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD" msgstr "" -"並未刪除分支 “%sâ€ï¼Œ 雖然已經åˆä½µåˆ° HEAD，\n" -" å»å°šæœªè¢«åˆä½µè‡³ “%s†分支" +"並未刪除分支「%sã€ï¼Œé›–然已經åˆä½µåˆ° HEAD，\n" +" å»å°šæœªè¢«åˆä½µè‡³ã€Œ%sã€åˆ†æ”¯" #: builtin/branch.c #, c-format msgid "couldn't look up commit object for '%s'" -msgstr "無法查詢 “%s†指å‘çš„æ交物件" +msgstr "無法查詢「%sã€æŒ‡å‘çš„æ交物件" #: builtin/branch.c #, c-format msgid "the branch '%s' is not fully merged" -msgstr "分支 “%s†沒有完全åˆä½µ" +msgstr "分支「%sã€æ²’有完全åˆä½µ" #: builtin/branch.c #, c-format msgid "If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "如果確定è¦åˆªé™¤å®ƒï¼Œè«‹åŸ·è¡Œ “git branch -D %sâ€" +msgstr "如果確定è¦åˆªé™¤å®ƒï¼Œè«‹åŸ·è¡Œã€Œgit branch -D %sã€" #: builtin/branch.c msgid "update of config-file failed" @@ -3391,12 +3408,12 @@ msgstr "ä¸èƒ½å°‡ -a å’Œ -d åŒæ™‚使用" #: builtin/branch.c #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" -msgstr "無法刪除被ä½æ–¼ “%2$s†的工作å€ä½¿ç”¨çš„ “%1$s†分支" +msgstr "無法刪除被ä½æ–¼ã€Œ%2$sã€çš„工作å€ä½¿ç”¨çš„分支「%1$sã€" #: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found" -msgstr "找ä¸åˆ° “%s†é 端追蹤分支" +msgstr "找ä¸åˆ°é 端追蹤分支「%sã€" #: builtin/branch.c #, c-format @@ -3404,13 +3421,13 @@ msgid "" "branch '%s' not found.\n" "Did you forget --remote?" msgstr "" -"找ä¸åˆ° “%s†分支。\n" -"您å¯èƒ½è¦åŠ 上 --remote？" +"找ä¸åˆ°åˆ†æ”¯ã€Œ%sã€ã€‚\n" +"您å¯èƒ½æƒ³åŠ 上 --remote？" #: builtin/branch.c #, c-format msgid "branch '%s' not found" -msgstr "找ä¸åˆ° “%s†分支" +msgstr "找ä¸åˆ°åˆ†æ”¯ã€Œ%sã€" #: builtin/branch.c #, c-format @@ -3428,42 +3445,42 @@ msgstr "無法解æžæ ¼å¼åŒ–å—串" #: builtin/branch.c msgid "could not resolve HEAD" -msgstr "ç„¡æ³•è§£æž HEAD 指é‡" +msgstr "ç„¡æ³•è§£æž HEAD 指標" #: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD æŒ‡é‡ (%s) æŒ‡å‘ refs/heads/ 之外" +msgstr "HEAD 指標 (%s) æŒ‡å‘ refs/heads/ 之外" #: builtin/branch.c #, c-format msgid "branch %s is being rebased at %s" -msgstr "%s 分支æ£åœ¨é‡å®šåŸºåº•è‡³ %s" +msgstr "分支 %s æ£åœ¨é‡å®šåŸºåº•è‡³ %s" #: builtin/branch.c #, c-format msgid "branch %s is being bisected at %s" -msgstr "%s 分支æ£æ–¼ %s 進行二分æœå°‹" +msgstr "分支 %s æ£æ–¼ %s 進行二分æœå°‹" #: builtin/branch.c #, c-format msgid "HEAD of working tree %s is not updated" -msgstr "%s 工作å€çš„ HEAD 指é‡æœªè¢«æ›´æ–°" +msgstr "%s 工作å€çš„ HEAD 指標未被更新" #: builtin/branch.c #, c-format msgid "invalid branch name: '%s'" -msgstr "分支å稱無效：“%sâ€" +msgstr "分支å稱無效：「%sã€" #: builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" -msgstr "分支 “%s†尚無æ交" +msgstr "分支「%sã€å°šç„¡æ交" #: builtin/branch.c #, c-format msgid "no branch named '%s'" -msgstr "沒有å為 “%s†的分支" +msgstr "沒有å為「%sã€çš„分支" #: builtin/branch.c msgid "branch rename failed" @@ -3476,17 +3493,17 @@ msgstr "分支拷è²å¤±æ•—" #: builtin/branch.c #, c-format msgid "created a copy of a misnamed branch '%s'" -msgstr "已為誤命åçš„ “%s†分支建立拷è²" +msgstr "已為誤命å的分支「%sã€å»ºç«‹æ‹·è²" #: builtin/branch.c #, c-format msgid "renamed a misnamed branch '%s' away" -msgstr "已更改誤命åçš„ “%s†分支的å稱" +msgstr "已更改誤命å的分支「%sã€çš„å稱" #: builtin/branch.c #, c-format msgid "branch renamed to %s, but HEAD is not updated" -msgstr "分支已é‡æ–°å‘½å為 %s，但 HEAD 指é‡å°šæœªæ›´æ–°" +msgstr "分支已é‡æ–°å‘½å為 %s，但 HEAD 指標尚未更新" #: builtin/branch.c msgid "branch is renamed, but update of config-file failed" @@ -3581,7 +3598,7 @@ msgstr "å³ä½¿ç›®æ¨™å·²å˜åœ¨ï¼Œä»ç§»å‹•æˆ–é‡æ–°å‘½å分支" #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "do not output a newline after empty formatted refs" -msgstr "åœ¨æ ¼å¼åŒ–引用çµæžœç‚ºç©ºä¹‹å¾Œï¼Œä¸è¦è¼¸å‡ºæ›åˆ—符號" +msgstr "åœ¨æ ¼å¼åŒ–çµæžœç‚ºç©ºçš„引用之後，ä¸è¦è¼¸å‡ºæ›åˆ—符號" #: builtin/branch.c msgid "copy a branch and its reflog" @@ -3650,7 +3667,7 @@ msgstr "無法將 HEAD 解æžç‚ºæœ‰æ•ˆå¼•ç”¨" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" -msgstr "HEAD 指é‡ä¸åœ¨ /refs/heads ä¸ï¼" +msgstr "HEAD 指標ä¸åœ¨ /refs/heads ä¸ï¼" #: builtin/branch.c msgid "" @@ -3669,7 +3686,7 @@ msgstr "å¿…é ˆæ供分支å稱" #: builtin/branch.c msgid "cannot give description to detached HEAD" -msgstr "無法å‘分離 HEAD 指é‡æä¾›æè¿°" +msgstr "無法å‘分離 HEAD 指標æä¾›æè¿°" #: builtin/branch.c msgid "cannot edit description of more than one branch" @@ -3704,12 +3721,12 @@ msgstr "無法將 HEAD 的上游è¨ç‚º %s：其未指å‘任何分支" #: builtin/branch.c #, c-format msgid "no such branch '%s'" -msgstr "ç„¡ “%s†分支" +msgstr "無「%sã€åˆ†æ”¯" #: builtin/branch.c #, c-format msgid "branch '%s' does not exist" -msgstr "沒有 “%s†分支" +msgstr "沒有「%sã€åˆ†æ”¯" #: builtin/branch.c msgid "too many arguments to unset upstream" @@ -3722,21 +3739,22 @@ msgstr "無法å–消è¨å®š HEAD 的上游：其未指å‘任何分支" #: builtin/branch.c #, c-format msgid "branch '%s' has no upstream information" -msgstr "分支 “%s†沒有上游資訊" +msgstr "分支「%sã€æ²’有上游資訊" #: builtin/branch.c msgid "" "the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"“git branch†的 -a å’Œ -r é¸é …ä¸å–分支å稱。\n" +"「git branchã€çš„ -a å’Œ -r é¸é …ä¸å–分支å稱。\n" "您是想使用：-a|-r --list <pattern> 嗎？" #: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead" -msgstr "ä¸å†æ”¯æ´é¸é … “--set-upstreamâ€ã€‚請改用 “--track†或 “--set-upstream-toâ€" +msgstr "" +"ä¸å†æ”¯æ´é¸é …「--set-upstreamã€ã€‚請改用「--trackã€æˆ–「--set-upstream-toã€" #: builtin/bugreport.c msgid "git version:\n" @@ -3745,7 +3763,7 @@ msgstr "git 版本：\n" #: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() 失敗，錯誤：“%s†(%d)\n" +msgstr "uname() 失敗，錯誤：「%sã€(%d)\n" #: builtin/bugreport.c msgid "compiler info: " @@ -3811,7 +3829,7 @@ msgstr "mode" #: builtin/bugreport.c msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" -msgstr "å¦å¤–建立有詳細診斷資訊的 ZIP å°å˜æª”（é è¨å€¼ “statsâ€ï¼‰" +msgstr "å¦å¤–建立有詳細診斷資訊的 ZIP å°å˜æª”（é è¨å€¼ã€Œstatsã€ï¼‰" #: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" @@ -3824,12 +3842,12 @@ msgstr "指定用於檔åçš„ strftime æ ¼å¼å¾Œç¶´" #: builtin/bugreport.c #, c-format msgid "unknown argument `%s'" -msgstr "未知引數 “%sâ€" +msgstr "未知引數「%sã€" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" -msgstr "無法建立 “%s†的å‰ç½®ç›®éŒ„" +msgstr "無法建立「%sã€çš„å‰ç½®ç›®éŒ„" #: builtin/bugreport.c builtin/diagnose.c #, c-format @@ -3852,7 +3870,7 @@ msgstr "無法寫入 %s" #: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" -msgstr "已在 “%sâ€ å»ºç«‹æ–°å ±å‘Šã€‚\n" +msgstr "已在「%sã€å»ºç«‹æ–°å ±å‘Šã€‚\n" #: builtin/bundle.c msgid "" @@ -3906,6 +3924,10 @@ msgstr "需è¦ç‰ˆæœ¬åº«ä¾†å»ºç«‹å¥—件包。" msgid "do not show bundle details" msgstr "ä¸é¡¯ç¤ºå¥—件包的詳細資訊" +#: builtin/bundle.c bundle.c +msgid "need a repository to verify a bundle" +msgstr "需è¦ç‰ˆæœ¬åº«é©—è‰å¥—件包" + #: builtin/bundle.c #, c-format msgid "%s is okay\n" @@ -3922,7 +3944,7 @@ msgstr "æ£åœ¨æ‹†åˆ†ç‰©ä»¶" #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" -msgstr "無法讀å–物件 %s “%sâ€" +msgstr "無法讀å–物件 %s「%sã€" #: builtin/cat-file.c msgid "flush is only for --buffer mode" @@ -3935,7 +3957,7 @@ msgstr "輸入ä¸æ²’有命令" #: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" -msgstr "命令å‰æœ‰ç©ºæ ¼ï¼šâ€œ%sâ€" +msgstr "命令å‰æœ‰ç©ºæ ¼ï¼šã€Œ%sã€" #: builtin/cat-file.c #, c-format @@ -4001,7 +4023,8 @@ msgstr "輸出 [æ壞的] ([broken]) 物件屬性" #: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" -msgstr "顯示物件類型（å¯ä»¥æ˜¯ “blobâ€ã€â€œtreeâ€ã€â€œcommitâ€ã€â€œtag†ç‰å…¶ä¸ä¸€å€‹ï¼‰" +msgstr "" +"顯示物件類型（å¯ä»¥æ˜¯ã€Œblobã€ã€ã€Œtreeã€ã€ã€Œcommitã€ã€ã€Œtagã€ç‰å…¶ä¸ä¸€å€‹ï¼‰" #: builtin/cat-file.c msgid "show object size" @@ -4079,12 +4102,12 @@ msgstr "blob|tree" #: builtin/cat-file.c msgid "use a <path> for (--textconv | --filters); Not with 'batch'" -msgstr "請在 (--textconv | --filters) 使用 <path>ï¼Œè€Œéž â€œbatchâ€" +msgstr "請在 (--textconv | --filters) 使用 <path>，而éžã€Œbatchã€" #: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" -msgstr "“%s=<%s>â€ éœ€è¦ â€œ%s†或 “%sâ€" +msgstr "「%s=<%s>ã€éœ€è¦ã€Œ%sã€æˆ–「%sã€" #: builtin/cat-file.c msgid "path|tree-ish" @@ -4093,12 +4116,12 @@ msgstr "path|tree-ish" #: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" -msgstr "“%s†需è¦æ‰¹æ¬¡è™•ç†æ¨¡å¼" +msgstr "「%sã€éœ€è¦æ‰¹æ¬¡è™•ç†æ¨¡å¼" #: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" -msgstr "“-%c†與批次處ç†æ¨¡å¼ä¸ç›¸å®¹" +msgstr "「-%cã€èˆ‡æ‰¹æ¬¡è™•ç†æ¨¡å¼ä¸ç›¸å®¹" #: builtin/cat-file.c msgid "batch modes take no arguments" @@ -4107,12 +4130,12 @@ msgstr "批次處ç†æ¨¡å¼ä¸å–引數" #: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" -msgstr "“%sâ€ éœ€è¦ <rev>" +msgstr "「%sã€éœ€è¦ <rev>" #: builtin/cat-file.c #, c-format msgid "<object> required with '-%c'" -msgstr "“-%câ€ éœ€è¦ <object>" +msgstr "「-%cã€éœ€è¦ <object>" #: builtin/cat-file.c #, c-format @@ -4286,32 +4309,32 @@ msgstr "git restore [<options>] [--source=<branch>] <file>..." #: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" -msgstr "“%s†路徑沒有我們的版本" +msgstr "「%sã€è·¯å¾‘沒有我們的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" -msgstr "“%s†路徑沒有他們的版本" +msgstr "「%sã€è·¯å¾‘沒有他們的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have all necessary versions" -msgstr "“%sâ€ è·¯å¾‘æ²’æœ‰æ‰€æœ‰å¿…é ˆçš„ç‰ˆæœ¬" +msgstr "「%sã€è·¯å¾‘æ²’æœ‰æ‰€æœ‰å¿…é ˆçš„ç‰ˆæœ¬" #: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" -msgstr "“%sâ€ è·¯å¾‘æ²’æœ‰å¿…é ˆçš„ç‰ˆæœ¬" +msgstr "「%sã€è·¯å¾‘æ²’æœ‰å¿…é ˆçš„ç‰ˆæœ¬" #: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" -msgstr "path “%sâ€ï¼šç„¡æ³•åˆä½µ" +msgstr "path「%sã€ï¼šç„¡æ³•åˆä½µ" #: builtin/checkout.c #, c-format msgid "Unable to add merge result for '%s'" -msgstr "無法為 “%sâ€ åŠ ä¸Šåˆä½µçµæžœ" +msgstr "無法為「%sã€åŠ 上åˆä½µçµæžœ" #: builtin/checkout.c #, c-format @@ -4334,37 +4357,37 @@ msgstr[0] "已從索引å€æ›´æ–° %d 個路徑" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "無法在更新路徑時使用 “%sâ€" +msgstr "無法在更新路徑時使用「%sã€" #: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "無法åŒæ™‚更新路徑和切æ›è‡³ “%s†分支。" +msgstr "無法åŒæ™‚更新路徑和切æ›è‡³ã€Œ%sã€åˆ†æ”¯ã€‚" #: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" -msgstr "“%s†或 “%s†皆未指定" +msgstr "「%sã€æˆ–「%sã€çš†æœªæŒ‡å®š" #: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" -msgstr "未指定 “%2$sâ€ æ™‚ï¼Œå¿…é ˆä½¿ç”¨ “%1$sâ€" +msgstr "未指定「%2$sã€æ™‚ï¼Œå¿…é ˆä½¿ç”¨ã€Œ%1$sã€" #: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" -msgstr "“%s†或 “%s†無法與 %s 一起使用" +msgstr "「%sã€æˆ–「%sã€ç„¡æ³•èˆ‡ %s 一起使用" #: builtin/checkout.c #, c-format msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" -msgstr "“%sâ€ã€â€œ%s†或 “%s†無法在簽出樹狀物件時使用" +msgstr "「%sã€ã€ã€Œ%sã€æˆ–「%sã€ç„¡æ³•åœ¨ç°½å‡ºæ¨¹ç‹€ç‰©ä»¶æ™‚使用" #: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" -msgstr "路徑 “%s†未åˆä½µ" +msgstr "路徑「%sã€æœªåˆä½µ" #: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c #: merge-ort.c reset.c sequencer.c tree-walk.c @@ -4388,7 +4411,7 @@ msgstr "" #: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" -msgstr "ç„¡æ³•å° â€œ%s†執行 reflog 動作：%s\n" +msgstr "無法å°ã€Œ%sã€åŸ·è¡Œ reflog 動作：%s\n" #: builtin/checkout.c msgid "HEAD is now at" @@ -4401,27 +4424,27 @@ msgstr "無法更新 HEAD" #: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" -msgstr "é‡è¨åˆ†æ”¯ “%sâ€\n" +msgstr "é‡è¨åˆ†æ”¯ã€Œ%sã€\n" #: builtin/checkout.c #, c-format msgid "Already on '%s'\n" -msgstr "已經ä½æ–¼ “%sâ€\n" +msgstr "已經ä½æ–¼ã€Œ%sã€\n" #: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "已切æ›ä¸¦é‡è¨åˆ†æ”¯ “%sâ€\n" +msgstr "已切æ›ä¸¦é‡è¨åˆ†æ”¯ã€Œ%sã€\n" #: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" -msgstr "已切æ›è‡³æ–°åˆ†æ”¯ “%sâ€\n" +msgstr "已切æ›è‡³æ–°åˆ†æ”¯ã€Œ%sã€\n" #: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" -msgstr "已切æ›è‡³åˆ†æ”¯ “%sâ€\n" +msgstr "已切æ›è‡³åˆ†æ”¯ã€Œ%sã€\n" # è¯è€…：請ç¶æŒå‰å°Žç©ºæ ¼ #: builtin/checkout.c @@ -4474,7 +4497,7 @@ msgstr "在修訂版éæ·æ™‚é‡åˆ°å…§éƒ¨éŒ¯èª¤" #: builtin/checkout.c msgid "Previous HEAD position was" -msgstr "之å‰çš„ HEAD 指é‡ä½ç½®åœ¨" +msgstr "之å‰çš„ HEAD 指標ä½ç½®åœ¨" #: builtin/checkout.c msgid "You are on a branch yet to be born" @@ -4486,7 +4509,7 @@ msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -"“%s†既å¯ä»¥æ˜¯æœ¬æ©Ÿæª”案，也å¯ä»¥æ˜¯è¿½è¹¤åˆ†æ”¯ã€‚\n" +"「%sã€æ—¢å¯ä»¥æ˜¯æœ¬æ©Ÿæª”案，也å¯ä»¥æ˜¯è¿½è¹¤åˆ†æ”¯ã€‚\n" "請使用 --（和å¯é¸çš„ --no-guess）來消除æ§ç¾©" #: builtin/checkout.c @@ -4500,19 +4523,19 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"如果您想è¦ç°½å‡ºé 端追蹤分支，例如 “originâ€ï¼Œ\n" +"如果您想è¦ç°½å‡ºé 端追蹤分支，例如「originã€ï¼Œ\n" "您å¯ä»¥ä½¿ç”¨ --track é¸é …寫出全å：\n" "\n" " git checkout --track origin/<name>\n" "\n" "如果您平時比較想è¦ä½¿ç”¨æ¨¡ç³Šçš„ç°¡çŸåˆ†æ”¯å稱 <name>，\n" -"而ä¸å¤ªæƒ³å¯«å¦‚ “origin†的é 端版本庫å稱，\n" +"而ä¸å¤ªæƒ³å¯«å¦‚「originã€çš„é 端版本庫å稱，\n" "å¯ä»¥åœ¨çµ„æ…‹ä¸è¨å®š checkout.defaultRemote=origin。" #: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "“%s†符åˆå¤šå€‹ (%d) é 端追蹤分支" +msgstr "「%sã€ç¬¦åˆå¤šå€‹ (%d) é 端追蹤分支" #: builtin/checkout.c msgid "only one reference expected" @@ -4536,27 +4559,27 @@ msgstr "引用ä¸æ˜¯æ¨¹ç‹€ç‰©ä»¶ï¼š%s" #: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" -msgstr "é 期收到分支，å»æ”¶åˆ°æ¨™ç±¤ “%sâ€" +msgstr "é 期收到分支，å»æ”¶åˆ°æ¨™ç±¤ã€Œ%sã€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" -msgstr "é 期收到分支，å»æ”¶åˆ°é 端分支 “%sâ€" +msgstr "é 期收到分支，å»æ”¶åˆ°é 端分支「%sã€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" -msgstr "é 期收到分支，å»æ”¶åˆ° “%sâ€" +msgstr "é 期收到分支，å»æ”¶åˆ°ã€Œ%sã€" #: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" -msgstr "é 期收到分支，å»æ”¶åˆ°æ交 “%sâ€" +msgstr "é 期收到分支，å»æ”¶åˆ°æ交「%sã€" #: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." -msgstr "若您想è¦åœ¨æ¤æ交分離 HEAD 指é‡ï¼Œè«‹å‚³å…¥ --detach é¸é …é‡è©¦ã€‚" +msgstr "若您想è¦åœ¨æ¤æ交分離 HEAD 指標，請傳入 --detach é¸é …é‡è©¦ã€‚" #: builtin/checkout.c msgid "" @@ -4564,7 +4587,7 @@ msgid "" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" "無法在åˆä½µæ™‚切æ›åˆ†æ”¯\n" -"請試試 “git merge --quit†或 “git worktree addâ€ã€‚" +"請試試「git merge --quitã€æˆ–「git worktree addã€ã€‚" #: builtin/checkout.c msgid "" @@ -4572,7 +4595,7 @@ msgid "" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" "無法在 am 工作階段期間時切æ›åˆ†æ”¯\n" -"請試試 “git am --quit†或 “git worktree addâ€ã€‚" +"請試試「git am --quitã€æˆ–「git worktree addã€ã€‚" #: builtin/checkout.c msgid "" @@ -4580,7 +4603,7 @@ msgid "" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" "無法在é‡å®šåŸºåº•æ™‚切æ›åˆ†æ”¯\n" -"請試試 “git rebase --quit†或 “git worktree addâ€ã€‚" +"請試試「git rebase --quitã€æˆ–「git worktree addã€ã€‚" #: builtin/checkout.c msgid "" @@ -4588,7 +4611,7 @@ msgid "" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" "無法在æ€é¸æ™‚切æ›åˆ†æ”¯\n" -"請試試 “git cherry-pick --quit†或 “git worktree addâ€ã€‚" +"請試試「git cherry-pick --quitã€æˆ–「git worktree addã€ã€‚" #: builtin/checkout.c msgid "" @@ -4596,7 +4619,7 @@ msgid "" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" "無法在還原時切æ›åˆ†æ”¯\n" -"請試試 “git revert --quit†或 “git worktree addâ€ã€‚" +"請試試「git revert --quitã€æˆ–「git worktree addã€ã€‚" #: builtin/checkout.c msgid "you are switching branch while bisecting" @@ -4609,22 +4632,22 @@ msgstr "路徑ä¸èƒ½èˆ‡åˆ‡æ›åˆ†æ”¯åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" -msgstr "“%s†ä¸èƒ½èˆ‡åˆ‡æ›åˆ†æ”¯åŒæ™‚使用" +msgstr "「%sã€ä¸èƒ½èˆ‡åˆ‡æ›åˆ†æ”¯åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "“%s†ä¸èƒ½èˆ‡ “%s†åŒæ™‚使用" +msgstr "「%sã€ä¸èƒ½èˆ‡ã€Œ%sã€åŒæ™‚使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot take <start-point>" -msgstr "“%s†ä¸å– <start-point>" +msgstr "「%sã€ä¸å– <start-point>" #: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" -msgstr "無法將分支切æ›è‡³éžæäº¤é …ç›® “%sâ€" +msgstr "無法將分支切æ›è‡³éžæäº¤é …ç›®ã€Œ%sã€" #: builtin/checkout.c msgid "missing branch or commit argument" @@ -4649,7 +4672,7 @@ msgstr "è¡çªè¼¸å‡ºé¢¨æ ¼ï¼ˆmergeã€diff3 或 zdiff3）" #: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" -msgstr "自指定æ交分離 HEAD 指é‡" +msgstr "自指定æ交分離 HEAD 指標" #: builtin/checkout.c msgid "force checkout (throw away local modifications)" @@ -4686,7 +4709,7 @@ msgstr "å°è·¯å¾‘è¦æ ¼ä¸åšç¨€ç–簽出的é™åˆ¶" #: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" -msgstr "“-%câ€ã€â€œ-%c†和 “%s†é¸é …ä¸å¾—åŒæ™‚使用" +msgstr "「-%cã€ã€ã€Œ-%cã€å’Œã€Œ%sã€é¸é …ä¸å¾—åŒæ™‚使用" #: builtin/checkout.c msgid "--track needs a branch name" @@ -4709,12 +4732,12 @@ msgstr "無效的路徑è¦æ ¼" #: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "“%s†ä¸æ˜¯æäº¤ï¼Œå› æ¤ä¸èƒ½ä»¥é€™ç‚ºåŸºç¤Žå»ºç«‹ “%s†分支" +msgstr "「%sã€ä¸æ˜¯æäº¤ï¼Œå› æ¤ä¸èƒ½ä»¥é€™ç‚ºåŸºç¤Žå»ºç«‹ã€Œ%sã€åˆ†æ”¯" #: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout：--detach ä¸å–路徑引數 “%sâ€" +msgstr "git checkout：--detach ä¸å–路徑引數「%sã€" #: builtin/checkout.c msgid "" @@ -4747,7 +4770,7 @@ msgstr "為新分支建立引用日誌" #: builtin/checkout.c msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "二次猜測 “git checkout <ç„¡æ¤åˆ†æ”¯>â€ï¼ˆé è¨å€¼ï¼‰" +msgstr "二次猜測「git checkout <ç„¡æ¤åˆ†æ”¯>ã€ï¼ˆé è¨å€¼ï¼‰" #: builtin/checkout.c msgid "use overlay mode (default)" @@ -4763,7 +4786,7 @@ msgstr "建立/é‡è¨ä¸¦åˆ‡æ›è‡³æŒ‡å®šåˆ†æ”¯" #: builtin/checkout.c msgid "second guess 'git switch <no-such-branch>'" -msgstr "二次猜測 “git switch <ç„¡æ¤åˆ†æ”¯>â€" +msgstr "二次猜測「git switch <ç„¡æ¤åˆ†æ”¯>ã€" #: builtin/checkout.c msgid "throw away local modifications" @@ -4907,7 +4930,7 @@ msgstr "" "clean - 開始清ç†\n" "filter by pattern - é€éŽç¯„本排除è¦åˆªé™¤çš„æ¢ç›®\n" "select by numbers - é€éŽæ•¸å—é¸æ“‡è¦åˆªé™¤çš„æ¢ç›®\n" -"ask each - é‡å°åˆªé™¤é€ä¸€è©¢å•ï¼ˆå°±åƒ “rm -iâ€ï¼‰\n" +"ask each - é‡å°åˆªé™¤é€ä¸€è©¢å•ï¼ˆå°±åƒã€Œrm -iã€ï¼‰\n" "quit - åœæ¢åˆªé™¤ä¸¦é›¢é–‹\n" "help - 顯示本輔助說明\n" "? - 顯示如何在æ示下é¸æ“‡çš„å”助" @@ -4937,9 +4960,9 @@ msgstr "互動å¼æ¸…除" msgid "remove whole directories" msgstr "移除整個目錄" -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c -#: ref-filter.h +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c +#: builtin/show-ref.c ref-filter.h msgid "pattern" msgstr "pattern" @@ -5027,7 +5050,7 @@ msgstr "name" #: builtin/clone.c msgid "use <name> instead of 'origin' to track upstream" -msgstr "使用 <name> 而ä¸æ˜¯ “origin†追蹤上游" +msgstr "使用 <name> 而ä¸æ˜¯ã€Œoriginã€è¿½è¹¤ä¸Šæ¸¸" #: builtin/clone.c msgid "checkout <branch> instead of the remote's HEAD" @@ -5138,7 +5161,7 @@ msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€å€‹ç›®éŒ„" #: builtin/clone.c #, c-format msgid "'%s' is a symlink, refusing to clone with --local" -msgstr "“%s†是個符號連çµï¼Œæ•…ä¸èƒ½ä½¿ç”¨ --local 複製" +msgstr "「%sã€æ˜¯å€‹ç¬¦è™Ÿé€£çµï¼Œæ•…ä¸èƒ½ä½¿ç”¨ --local 複製" #: builtin/clone.c #, c-format @@ -5153,7 +5176,17 @@ msgstr "「%sã€ç¬¦è™Ÿé€£çµå·²å˜åœ¨ï¼Œæ‹’絕使用 --local 複製" #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" -msgstr "無法刪除 “%sâ€" +msgstr "無法刪除「%sã€" + +#: builtin/clone.c +#, c-format +msgid "hardlink cannot be checked at '%s'" +msgstr "無法檢查ä½æ–¼ã€Œ%sã€çš„硬連çµ" + +#: builtin/clone.c +#, c-format +msgid "hardlink different from source at '%s'" +msgstr "硬連çµèˆ‡ä½æ–¼ '%s' 的來æºä¸åŒ" #: builtin/clone.c #, c-format @@ -5231,10 +5264,10 @@ msgstr "太多åƒæ•¸ã€‚" msgid "You must specify a repository to clone." msgstr "æ‚¨å¿…é ˆæŒ‡å®šè¦è¤‡è£½çš„版本庫。" -#: builtin/clone.c builtin/init-db.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c #, c-format msgid "unknown ref storage format '%s'" -msgstr "未知的引用儲å˜æ ¼å¼ “%sâ€" +msgstr "未知的引用儲å˜æ ¼å¼ã€Œ%sã€" #: builtin/clone.c #, c-format @@ -5331,7 +5364,7 @@ msgstr "無法åˆå§‹åŒ–版本庫，略éŽå¥—件包 URI" #: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" -msgstr "無法從套件包 URL “%s†抓å–物件" +msgstr "無法從套件包 URL「%sã€æŠ“å–物件" #: builtin/clone.c msgid "failed to fetch advertised bundles" @@ -5391,7 +5424,7 @@ msgstr "--command å¿…é ˆæ˜¯ç¬¬ä¸€å€‹åƒæ•¸" msgid "" "git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <目錄>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c msgid "" @@ -5415,21 +5448,21 @@ msgstr "目錄" #: builtin/commit-graph.c msgid "the object directory to store the graph" -msgstr "儲å˜åœ–形的物件目錄" +msgstr "儲å˜åœ–的物件目錄" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果æ交圖形被分割，åªé©—è‰é 一個檔案" +msgstr "如果æ交圖被分割，åªé©—è‰é 一個檔案" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" -msgstr "無法開啟æ交圖形 '%s'" +msgstr "無法開啟æ交圖「%sã€" #: builtin/commit-graph.c #, c-format msgid "could not open commit-graph chain '%s'" -msgstr "無法開啟æäº¤åœ–éˆ â€œ%sâ€" +msgstr "無法開啟æ交圖éˆã€Œ%sã€" #: builtin/commit-graph.c #, c-format @@ -5465,7 +5498,7 @@ msgstr "從標準輸入ä¸çš„æ交開始掃æ" #: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" -msgstr "åŒ…å« commit-graph 檔案ä¸å·²æœ‰æ‰€æœ‰æ交" +msgstr "包å«æ交圖檔案ä¸æ‰€æœ‰å·²æœ‰çš„æ交" #: builtin/commit-graph.c msgid "enable computation for changed paths" @@ -5473,15 +5506,15 @@ msgstr "啟用已變更路徑的計算" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" -msgstr "å…許寫一個增é‡æ交圖形檔案" +msgstr "å…許寫一個增é‡æ交圖檔案" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在éžåŸºæœ¬åˆ†å‰²æ交圖形ä¸çš„最大æ交數" +msgstr "在éžåŸºç¤Žåˆ†å‰²æ交圖ä¸çš„最大æ交數" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一個分割æ交圖形的兩個級別之間的最大比率" +msgstr "一個分割æ交圖的兩個級別之間的最大比率" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" @@ -5719,7 +5752,7 @@ msgstr "無法é¸æ“‡ä¸€å€‹æœªè¢«ç›®å‰æ交說明使用的備註å—å…ƒ" #: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" -msgstr "無法查詢æ交 “%sâ€" +msgstr "無法查詢æ交「%sã€" #: builtin/commit.c builtin/shortlog.c #, c-format @@ -5845,7 +5878,7 @@ msgstr "%sæ交者：%.*s <%.*s>" msgid "Cannot read index" msgstr "無法讀å–索引" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" msgstr "無法將尾部署å傳éžè‡³ --trailers" @@ -6056,11 +6089,11 @@ msgstr "使用 autosquash æ ¼å¼çš„æ交說明用以壓縮至指定的æ交" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "ç¾åœ¨å°‡è©²æ交的作者改為我（和 -C/-c/--amend åƒæ•¸å…±ç”¨ï¼‰" -#: builtin/commit.c builtin/interpret-trailers.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c msgid "trailer" msgstr "尾部署å" -#: builtin/commit.c +#: builtin/commit.c builtin/tag.c msgid "add custom trailer(s)" msgstr "åŠ å…¥è‡ªè¨‚å°¾éƒ¨ç½²å" @@ -6169,20 +6202,60 @@ msgid "" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "版本庫已更新，但無法寫入新的索引檔案。請檢查ç£ç¢Ÿæ˜¯å¦\n" -"已滿或ç£ç¢Ÿé…é¡å·²è€—盡，然後執行 “git restore --staged :/†復原。" +"已滿或ç£ç¢Ÿé…é¡å·²è€—盡，然後執行「git restore --staged :/ã€å¾©åŽŸã€‚" #: builtin/config.c -msgid "git config [<options>]" -msgstr "git config [<é¸é …>]" +msgid "git config list [<file-option>] [<display-option>] [--includes]" +msgstr "git config list [<檔案é¸é …>] [<顯示é¸é …>] [--includes]" #: builtin/config.c -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "無法è˜åˆ¥çš„ --type åƒæ•¸ï¼Œ%s" +msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<檔案é¸é …>] [<顯示é¸é …>] [--includes] [--all] [--regexp=<常è¦" +"表示å¼>] [--value=<值>] [--fixed-value] [--default=<é è¨å€¼>] <å稱>" #: builtin/config.c -msgid "only one type at a time" -msgstr "一次åªèƒ½ä¸€å€‹é¡žåž‹" +msgid "" +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" +"fixed-value] <name> <value>" +msgstr "" +"git config set [<檔案é¸é …>] [--type=<é¡žåž‹>] [--all] [--value=<值>] [--fixed-" +"value] <å稱> <值>" + +#: builtin/config.c +msgid "" +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " +"<name> <value>" +msgstr "" +"git config unset [<檔案é¸é …>] [--all] [--value=<值>] [--fixed-value] <å稱> <" +"值>" + +#: builtin/config.c +msgid "git config rename-section [<file-option>] <old-name> <new-name>" +msgstr "git config rename-section [<檔案é¸é …>] <舊å稱> <æ–°å稱>" + +#: builtin/config.c +msgid "git config remove-section [<file-option>] <name>" +msgstr "git config remove-section [<檔案é¸é …>] <å稱>" + +#: builtin/config.c +msgid "git config edit [<file-option>]" +msgstr "git config edit [<檔案é¸é …>]" + +#: builtin/config.c +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" +msgstr "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" + +#: builtin/config.c +msgid "" +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " +"[--value=<value>] [--fixed-value] <name> <value>" +msgstr "" +"git config set [<檔案é¸é …>] [--type=<é¡žåž‹>] [--comment=<備註>] [--all] [--" +"value=<值>] [--fixed-value] <å稱> <值>" #: builtin/config.c msgid "Config file location" @@ -6217,70 +6290,6 @@ msgid "read config from given blob object" msgstr "從æ供的資料物件讀å–è¨å®š" #: builtin/config.c -msgid "Action" -msgstr "動作" - -#: builtin/config.c -msgid "get value: name [value-pattern]" -msgstr "å–得值：name [value-pattern]" - -#: builtin/config.c -msgid "get all values: key [value-pattern]" -msgstr "å–得所有值：key [value-pattern]" - -#: builtin/config.c -msgid "get values for regexp: name-regex [value-pattern]" -msgstr "æ ¹æ“šå¸¸è¦è¡¨ç¤ºå¼å–得值：name-regex [value-pattern]" - -#: builtin/config.c -msgid "get value specific for the URL: section[.var] URL" -msgstr "ç²å¾— URL å–值：section[.var] URL" - -#: builtin/config.c -msgid "replace all matching variables: name value [value-pattern]" -msgstr "å–代所有符åˆçš„變數：name value [value-pattern]" - -#: builtin/config.c -msgid "add a new variable: name value" -msgstr "新增一個新的變數：name value" - -#: builtin/config.c -msgid "remove a variable: name [value-pattern]" -msgstr "移除一個變數：name [value-pattern]" - -#: builtin/config.c -msgid "remove all matches: name [value-pattern]" -msgstr "移除所有符åˆé …目：name [value-pattern]" - -#: builtin/config.c -msgid "rename section: old-name new-name" -msgstr "é‡æ–°å‘½åå°ç¯€ï¼šold-name new-name" - -#: builtin/config.c -msgid "remove a section: name" -msgstr "刪除一個å°ç¯€ï¼šname" - -#: builtin/config.c -msgid "list all" -msgstr "全部列出" - -#: builtin/config.c -msgid "use string equality when comparing values to 'value-pattern'" -msgstr "比較「value-patternã€çš„值時，使用å—串相ç‰æ¯”較" - -#: builtin/config.c -msgid "open an editor" -msgstr "開啟一個編輯器" - -#: builtin/config.c -msgid "find the color configured: slot [default]" -msgstr "ç²å¾—è¨å®šçš„é¡è‰²ï¼šè¨å®š [é è¨å€¼]" - -#: builtin/config.c -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "ç²å¾—é¡è‰²è¨å®šï¼šè¨å®š [stdout-is-tty]" - -#: builtin/config.c msgid "Type" msgstr "é¡žåž‹" @@ -6317,8 +6326,8 @@ msgid "value is an expiry date" msgstr "值是一個到期日期" #: builtin/config.c -msgid "Other" -msgstr "其它" +msgid "Display options" +msgstr "顯示é¸é …" #: builtin/config.c msgid "terminate values with NUL byte" @@ -6329,10 +6338,6 @@ msgid "show variable names only" msgstr "åªé¡¯ç¤ºè®Šæ•¸å" #: builtin/config.c -msgid "respect include directives on lookup" -msgstr "查詢時引用 include 指令éžè¿´å°‹æ‰¾" - -#: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "顯示è¨å®šçš„來æºï¼ˆæª”案ã€æ¨™æº–輸入ã€è³‡æ–™ç‰©ä»¶ï¼Œæˆ–命令列）" @@ -6343,16 +6348,17 @@ msgstr "" "令 command)" #: builtin/config.c -msgid "value" -msgstr "å–值" +msgid "show config keys in addition to their values" +msgstr "除了顯示組態值，é¡å¤–顯示其éµå" #: builtin/config.c -msgid "with --get, use default value when missing entry" -msgstr "使用 --get 但未指定åƒæ•¸æ™‚所使用的é è¨å€¼" +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "無法è˜åˆ¥çš„ --type åƒæ•¸ï¼Œ%s" #: builtin/config.c -msgid "human-readable comment string (# will be prepended as needed)" -msgstr "人類å¯è®€çš„備註å—串（將按需æ’å…¥ # 至å‰æ–¹ï¼‰" +msgid "only one type at a time" +msgstr "一次åªèƒ½ä¸€å€‹é¡žåž‹" #: builtin/config.c #, c-format @@ -6445,56 +6451,93 @@ msgstr "" "詳情請閱讀「git help worktreeã€çš„「CONFIGURATION FILEã€å°ç¯€" #: builtin/config.c -msgid "--get-color and variable type are incoherent" -msgstr "--get-color 和變數類型ä¸ç›¸å®¹" +msgid "Other" +msgstr "其它" #: builtin/config.c -msgid "only one action at a time" -msgstr "一次åªèƒ½æœ‰ä¸€å€‹å‹•ä½œ" +msgid "respect include directives on lookup" +msgstr "查詢時引用 include 指令éžè¿´å°‹æ‰¾" #: builtin/config.c -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only 僅é©ç”¨æ–¼ --list 或 --get-regexp" +#, c-format +msgid "unable to read config file '%s'" +msgstr "無法讀å–è¨å®šæª”案 '%s'" #: builtin/config.c -msgid "" -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" -"list" -msgstr "--show-origin 僅é©ç”¨æ–¼ --getã€--get-allã€--get-regexp å’Œ --list" +msgid "error processing config file(s)" +msgstr "處ç†è¨å®šæª”案發生錯誤" #: builtin/config.c -msgid "--default is only applicable to --get" -msgstr "--default 僅é©ç”¨æ–¼ --get" +msgid "Filter options" +msgstr "éŽæ¿¾é¸é …" #: builtin/config.c -msgid "--comment is only applicable to add/set/replace operations" -msgstr "--comment åªèƒ½ç”¨æ–¼åŠ å…¥ã€è¨å®šå’Œå–代動作" +msgid "return all values for multi-valued config options" +msgstr "å›žå‚³æœ‰å¤šé …å€¼ä¹‹çµ„æ…‹é¸é …的所有值" + +#: builtin/config.c +msgid "interpret the name as a regular expression" +msgstr "å°‡å稱當作常è¦è¡¨ç¤ºå¼è§£è®€" + +#: builtin/config.c +msgid "show config with values matching the pattern" +msgstr "顯示值符åˆæ¨¡å¼çš„組態" + +#: builtin/config.c +msgid "use string equality when comparing values to value pattern" +msgstr "使用å—串相ç‰æ¯”較值和模å¼" + +#: builtin/config.c +msgid "URL" +msgstr "URL" + +#: builtin/config.c +msgid "show config matching the given URL" +msgstr "顯示符åˆæä¾› URL 的組態" + +#: builtin/config.c +msgid "value" +msgstr "å–值" + +#: builtin/config.c +msgid "use default value when missing entry" +msgstr "未指定åƒæ•¸æ™‚所使用的é è¨å€¼" #: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" #: builtin/config.c -#, c-format -msgid "unable to read config file '%s'" -msgstr "無法讀å–è¨å®šæª”案 '%s'" +msgid "--default= cannot be used with --all or --url=" +msgstr "--default= 無法和 --all 或 --url= 一起使用" #: builtin/config.c -msgid "error processing config file(s)" -msgstr "處ç†è¨å®šæª”案發生錯誤" +msgid "--url= cannot be used with --all, --regexp or --value" +msgstr "--url= 無法和 --allã€--regexpã€--value 一起使用" #: builtin/config.c -msgid "editing stdin is not supported" -msgstr "ä¸æ”¯æ´ç·¨è¼¯æ¨™æº–輸入" +msgid "Filter" +msgstr "éŽæ¿¾å™¨" #: builtin/config.c -msgid "editing blobs is not supported" -msgstr "ä¸æ”¯æ´ç·¨è¼¯è³‡æ–™ç‰©ä»¶" +msgid "replace multi-valued config option with new value" +msgstr "以新值å–ä»£æœ‰å¤šé …å€¼çš„çµ„æ…‹é¸é …" #: builtin/config.c -#, c-format -msgid "cannot create configuration file %s" -msgstr "ä¸èƒ½å»ºç«‹è¨å®šæª”案 %s" +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人類å¯è®€çš„備註å—串（將按需æ’å…¥ # 至å‰æ–¹ï¼‰" + +#: builtin/config.c +msgid "add a new line without altering any existing values" +msgstr "在ä¸æ›´å‹•ä»»ä½•ç¾æœ‰å€¼çš„情æ³ä¸‹æ–°å¢žä¸€è¡Œ" + +#: builtin/config.c +msgid "--fixed-value only applies with --value=<pattern>" +msgstr "--fixed-value 僅套用至 --value=<模å¼>" + +#: builtin/config.c +msgid "--append cannot be used with --value=<pattern>" +msgstr "--append 無法和 --value=<模å¼> 一起使用" #: builtin/config.c #, c-format @@ -6510,6 +6553,109 @@ msgstr "" msgid "no such section: %s" msgstr "ç„¡æ¤å°ç¯€ï¼š%s" +#: builtin/config.c +msgid "editing stdin is not supported" +msgstr "ä¸æ”¯æ´ç·¨è¼¯æ¨™æº–輸入" + +#: builtin/config.c +msgid "editing blobs is not supported" +msgstr "ä¸æ”¯æ´ç·¨è¼¯è³‡æ–™ç‰©ä»¶" + +#: builtin/config.c +#, c-format +msgid "cannot create configuration file %s" +msgstr "ä¸èƒ½å»ºç«‹è¨å®šæª”案 %s" + +#: builtin/config.c +msgid "Action" +msgstr "動作" + +#: builtin/config.c +msgid "get value: name [<value-pattern>]" +msgstr "å–得值：name [<value-pattern>]" + +#: builtin/config.c +msgid "get all values: key [<value-pattern>]" +msgstr "å–得所有值：key [<value-pattern>]" + +#: builtin/config.c +msgid "get values for regexp: name-regex [<value-pattern>]" +msgstr "æ ¹æ“šå¸¸è¦è¡¨ç¤ºå¼å–得值：name-regex [<value-pattern>]" + +#: builtin/config.c +msgid "get value specific for the URL: section[.var] URL" +msgstr "ç²å¾— URL å–值：section[.var] URL" + +#: builtin/config.c +msgid "replace all matching variables: name value [<value-pattern>]" +msgstr "å–代所有符åˆçš„變數：name value [<value-pattern>]" + +#: builtin/config.c +msgid "add a new variable: name value" +msgstr "新增一個新的變數：name value" + +#: builtin/config.c +msgid "remove a variable: name [<value-pattern>]" +msgstr "移除一個變數：name [<value-pattern>]" + +#: builtin/config.c +msgid "remove all matches: name [<value-pattern>]" +msgstr "移除所有符åˆé …目：name [<value-pattern>]" + +#: builtin/config.c +msgid "rename section: old-name new-name" +msgstr "é‡æ–°å‘½åå°ç¯€ï¼šold-name new-name" + +#: builtin/config.c +msgid "remove a section: name" +msgstr "刪除一個å°ç¯€ï¼šname" + +#: builtin/config.c +msgid "list all" +msgstr "全部列出" + +#: builtin/config.c +msgid "open an editor" +msgstr "開啟一個編輯器" + +#: builtin/config.c +msgid "find the color configured: slot [<default>]" +msgstr "ç²å¾—è¨å®šçš„é¡è‰²ï¼šè¨å®š [<é è¨å€¼>]" + +#: builtin/config.c +msgid "find the color setting: slot [<stdout-is-tty>]" +msgstr "ç²å¾—é¡è‰²è¨å®šï¼šè¨å®š [<stdout-is-tty>]" + +#: builtin/config.c +msgid "with --get, use default value when missing entry" +msgstr "使用 --get 但未指定åƒæ•¸æ™‚所使用的é è¨å€¼" + +#: builtin/config.c +msgid "--get-color and variable type are incoherent" +msgstr "--get-color 和變數類型ä¸ç›¸å®¹" + +#: builtin/config.c +msgid "no action specified" +msgstr "未指定動作" + +#: builtin/config.c +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only 僅é©ç”¨æ–¼ --list 或 --get-regexp" + +#: builtin/config.c +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin 僅é©ç”¨æ–¼ --getã€--get-allã€--get-regexp å’Œ --list" + +#: builtin/config.c +msgid "--default is only applicable to --get" +msgstr "--default 僅é©ç”¨æ–¼ --get" + +#: builtin/config.c +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment åªèƒ½ç”¨æ–¼åŠ å…¥ã€è¨å®šå’Œå–代動作" + #: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "以使用者å¯è®€çš„æ ¼å¼é¡¯ç¤ºå¤§å°" @@ -6694,11 +6840,11 @@ msgstr "標記" #: builtin/describe.c msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "å°æ–¼é«’工作å€ï¼Œè¿½åŠ <標記>（é è¨å€¼ï¼šâ€-dirty\"）" +msgstr "å°æ–¼é«’工作å€ï¼Œè¿½åŠ <標記>（é è¨å€¼ï¼šã€-dirty\"）" #: builtin/describe.c msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "å°æ–¼æ壞的工作å€ï¼Œè¿½åŠ <標記>（é è¨å€¼ï¼šâ€-broken\"）" +msgstr "å°æ–¼æ壞的工作å€ï¼Œè¿½åŠ <標記>（é è¨å€¼ï¼šã€-broken\"）" #: builtin/describe.c msgid "No names found, cannot describe anything." @@ -7363,7 +7509,7 @@ msgstr "在所有更新分支上檢查強制更新" #: builtin/fetch.c msgid "write the commit-graph after fetching" -msgstr "抓å–後寫入分支圖" +msgstr "抓å–後寫入æ交圖" #: builtin/fetch.c msgid "accept refspecs from stdin" @@ -7539,6 +7685,10 @@ msgid "config key storing a list of repository paths" msgstr "儲å˜ç‰ˆæœ¬åº«è·¯å¾‘清單的è¨å®šéµ" #: builtin/for-each-repo.c +msgid "keep going even if command fails in a repository" +msgstr "命令在版本庫ä¸å¤±æ•—時ä»ç¹¼çºŒåŸ·è¡Œ" + +#: builtin/for-each-repo.c msgid "missing --config=<config>" msgstr "缺少 --config=<è¨å®š>" @@ -7753,12 +7903,12 @@ msgstr "%s：%s çš„ resolve-undo ä¸çš„ sha1 指標無效" #: builtin/fsck.c #, c-format msgid "unable to load rev-index for pack '%s'" -msgstr "ç„¡æ³•è®€å– â€œ%s†å°è£çš„修訂版索引 (rev-index)" +msgstr "無法讀å–「%sã€å°è£çš„修訂版索引 (rev-index)" #: builtin/fsck.c #, c-format msgid "invalid rev-index for pack '%s'" -msgstr "“%s†å°è£çš„修訂版索引 (rev-index) 無效" +msgstr "「%sã€å°è£çš„修訂版索引 (rev-index) 無效" #: builtin/fsck.c msgid "" @@ -8065,7 +8215,7 @@ msgstr "無法è˜åˆ¥çš„ --schedule 引數 '%s'" #: builtin/gc.c msgid "failed to write commit-graph" -msgstr "無法寫入æ交圖形" +msgstr "無法寫入æ交圖" #: builtin/gc.c msgid "failed to prefetch remotes" @@ -8192,7 +8342,7 @@ msgstr "無法啟動 schtasks" #: builtin/gc.c msgid "failed to run 'crontab -l'; your system might not support 'cron'" -msgstr "無法執行 “crontab -lâ€ï¼›æ‚¨çš„系統å¯èƒ½ä¸æ”¯æ´ “cronâ€" +msgstr "無法執行「crontab -lã€ï¼›æ‚¨çš„系統å¯èƒ½ä¸æ”¯æ´ã€Œcronã€" #: builtin/gc.c msgid "failed to create crontab temporary file" @@ -8204,11 +8354,11 @@ msgstr "無法開啟暫å˜æª”" #: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "無法執行 “crontabâ€ï¼›æ‚¨çš„系統å¯èƒ½ä¸æ”¯æ´ “cronâ€" +msgstr "無法執行「crontabã€ï¼›æ‚¨çš„系統å¯èƒ½ä¸æ”¯æ´ã€Œcronã€" #: builtin/gc.c msgid "'crontab' died" -msgstr "“crontab†çµæŸé‹ä½œ" +msgstr "「crontabã€çµæŸé‹ä½œ" #: builtin/gc.c builtin/worktree.c #, c-format @@ -9135,7 +9285,7 @@ msgstr "--only-trailers --only-input --unfold 的別å" #: builtin/interpret-trailers.c msgid "do not treat \"---\" as the end of input" -msgstr "ä¸è¦æŠŠ “---†當作輸入çµå°¾" +msgstr "ä¸è¦æŠŠã€Œ---ã€ç•¶ä½œè¼¸å…¥çµå°¾" #: builtin/interpret-trailers.c msgid "trailer(s) to add" @@ -9250,7 +9400,7 @@ msgstr "ä¸æ˜¯ä¸€å€‹ç¯„åœ" #: builtin/log.c #, c-format msgid "unable to read branch description file '%s'" -msgstr "無法讀å–分支æ述檔 “%sâ€" +msgstr "無法讀å–分支æ述檔「%sã€" #: builtin/log.c msgid "cover letter needs email format" @@ -9367,8 +9517,12 @@ msgid "max length of output filename" msgstr "輸出檔å的最大長度" #: builtin/log.c -msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "使用 [RFC PATCH] 代替 [PATCH]" +msgid "rfc" +msgstr "rfc" + +#: builtin/log.c +msgid "add <rfc> (default 'RFC') before 'PATCH'" +msgstr "在「PATCHã€å‰å† 上 <rfc>（é è¨ç‚ºã€ŒRFCã€ï¼‰" #: builtin/log.c msgid "cover-from-description-mode" @@ -9711,11 +9865,11 @@ msgstr "" #: builtin/ls-remote.c msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<patterns>...]]" @@ -9736,9 +9890,13 @@ msgid "limit to tags" msgstr "僅é™æ–¼æ¨™ç±¤" #: builtin/ls-remote.c -msgid "limit to heads" +msgid "limit to branches" msgstr "僅é™æ–¼åˆ†æ”¯" +#: builtin/ls-remote.c builtin/show-ref.c +msgid "deprecated synonym for --branches" +msgstr "--branches 已棄用的åŒç¾©è©ž" + #: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "ä¸é¡¯ç¤ºå·²è§£æžçš„標籤" @@ -9963,7 +10121,7 @@ msgstr "為 檔案1/åˆå§‹æª”案/檔案2 è¨å®šæ¨™ç±¤" #: builtin/merge-file.c #, c-format msgid "object '%s' does not exist" -msgstr "物件 “%s†ä¸å˜åœ¨" +msgstr "物件「%sã€ä¸å˜åœ¨" #: builtin/merge-file.c msgid "Could not write object file" @@ -11215,7 +11373,7 @@ msgstr "ä¸ä¸€è‡´çš„差異計數" #: builtin/pack-objects.c #, c-format msgid "invalid pack.allowPackReuse value: '%s'" -msgstr "無效的 pack.allowPackReuse 值：“%sâ€" +msgstr "無效的 pack.allowPackReuse 值：「%sã€" #: builtin/pack-objects.c #, c-format @@ -11223,8 +11381,8 @@ msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -"uploadpack.blobpackfileuri çš„å€¼æ ¼å¼å¿…é ˆç‚º '<object-hash> <pack-hash> <uri>' " -"(收到 '%s')" +"uploadpack.blobpackfileuri çš„å€¼æ ¼å¼å¿…é ˆç‚º '<object-hash> <pack-hash> " +"<uri>' (收到 '%s')" #: builtin/pack-objects.c #, c-format @@ -11860,7 +12018,7 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'.\n" msgstr "" "\n" -"è‹¥è¦æ°¸ä¹…é¸æ“‡æŸå€‹é¸é …，請åƒé–± “git help config†ä¸çš„ push.default。\n" +"è‹¥è¦æ°¸ä¹…é¸æ“‡æŸå€‹é¸é …，請åƒé–±ã€Œgit help configã€ä¸çš„ push.default。\n" #: builtin/push.c msgid "" @@ -11871,8 +12029,8 @@ msgid "" msgstr "" "\n" "è‹¥è¦é¿å…在å稱與本機分支ä¸åŒæ™‚自動è¨å®šä¸Šæ¸¸åˆ†æ”¯ï¼Œ\n" -"è«‹åƒé–± “git help configâ€ ä¸ branch.autoSetupMerge çš„\n" -"“simple†é¸é …。\n" +"è«‹åƒé–±ã€Œgit help configã€ä¸ branch.autoSetupMerge çš„\n" +"「simpleã€é¸é …。\n" #: builtin/push.c #, c-format @@ -11919,8 +12077,8 @@ msgid "" "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" msgstr "" "\n" -"è‹¥è¦ä½¿æ²’有追蹤上游的分支自動é…置，請åƒé–± “git help config†ä¸çš„\n" -"“push.autoSetupRemoteâ€ã€‚\n" +"è‹¥è¦ä½¿æ²’有追蹤上游的分支自動é…置，請åƒé–±ã€Œgit help configã€ä¸çš„\n" +"「push.autoSetupRemoteã€ã€‚\n" #: builtin/push.c #, c-format @@ -11965,8 +12123,8 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "æ›´æ–°è¢«æ‹’çµ•ï¼Œå› ç‚ºæ‚¨ç›®å‰åˆ†æ”¯çš„最新æ交è½å¾Œæ–¼å…¶å°æ‡‰çš„é 端分支。\n" -"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ “git pullâ€ã€‚詳見\n" -"“git push --help†ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" +"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ã€Œgit pullã€ã€‚詳見\n" +"「git push --helpã€ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" #: builtin/push.c msgid "" @@ -11976,8 +12134,8 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "æ›´æ–°è¢«æ‹’çµ•ï¼Œå› ç‚ºæŽ¨é€çš„æŸåˆ†æ”¯çš„最新æ交è½å¾Œæ–¼å…¶å°æ‡‰çš„é 端分支。\n" -"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ “git pullâ€ã€‚詳見\n" -"“git push --help†ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" +"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ã€Œgit pullã€ã€‚詳見\n" +"「git push --helpã€ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" #: builtin/push.c msgid "" @@ -11989,7 +12147,7 @@ msgid "" msgstr "" "æ›´æ–°è¢«æ‹’çµ•ï¼Œå› ç‚ºé 端包å«æ‚¨æœ¬æ©Ÿæ²’有的æäº¤ã€‚é€™é€šå¸¸æ˜¯å› ç‚º\n" "å¦ä¸€å€‹ç‰ˆæœ¬åº«æœ‰æŽ¨é€æ›´å‹•åˆ°åŒå€‹å¼•ç”¨ã€‚如果您想è¦æ•´åˆé 端更動，\n" -"請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ “git pullâ€ã€‚詳見 “git push --help†ä¸çš„\n" +"請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ã€Œgit pullã€ã€‚詳見「git push --helpã€ä¸çš„\n" "〈Note about fast-forwards〉å°ç¯€ã€‚" #: builtin/push.c @@ -12013,8 +12171,8 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "æ›´æ–°è¢«æ‹’çµ•ï¼Œå› ç‚ºé 端追蹤分支的最新æ交自上次簽出後有改變。\n" -"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ “git pullâ€ã€‚\n" -"詳見 “git push --help†ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" +"如果您想è¦æ•´åˆé 端更動，請在å†æ¬¡æŽ¨é€å‰ä½¿ç”¨ã€Œgit pullã€ã€‚\n" +"詳見「git push --helpã€ä¸çš„〈Note about fast-forwards〉å°ç¯€ã€‚" #: builtin/push.c #, c-format @@ -12607,8 +12765,8 @@ msgid "" "which is no longer supported; use 'merges' instead" msgstr "" "--preserve-merges 已被 --rebase-merges å–代\n" -"註：您的 `pull.rebase` è¨å®šå¯èƒ½ä¹Ÿè¢«è¨å®šç‚ºä¸å—支æ´çš„ “preserveâ€ï¼›\n" -"請改用 “mergesâ€" +"註：您的 `pull.rebase` è¨å®šå¯èƒ½ä¹Ÿè¢«è¨å®šç‚ºä¸å—支æ´çš„「preserveã€ï¼›\n" +"請改用「mergesã€" #: builtin/rebase.c msgid "no rebase in progress" @@ -12928,6 +13086,27 @@ msgstr "未指定è¦åˆªé™¤çš„引用日誌" msgid "invalid ref format: %s" msgstr "ç„¡æ•ˆçš„å¼•ç”¨æ ¼å¼ï¼š%s" +#: builtin/refs.c +msgid "git refs migrate --ref-format=<format> [--dry-run]" +msgstr "git refs migrate --ref-format=<æ ¼å¼> [--dry-run]" + +#: builtin/refs.c +msgid "specify the reference format to convert to" +msgstr "指定è¦è½‰æ›æˆçš„å¼•ç”¨æ ¼å¼" + +#: builtin/refs.c +msgid "perform a non-destructive dry-run" +msgstr "進行éžç ´å£žæ€§çš„試執行" + +#: builtin/refs.c +msgid "missing --ref-format=<format>" +msgstr "缺少 --ref-format=<æ ¼å¼>" + +#: builtin/refs.c +#, c-format +msgid "repository already uses '%s' format" +msgstr "版本庫已經使用 '%s' æ ¼å¼" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -13273,10 +13452,6 @@ msgstr "* é 端 %s" msgid " Fetch URL: %s" msgstr " å–å¾—ä½å€ï¼š%s" -#: builtin/remote.c -msgid "(no URL)" -msgstr "(ç„¡ URL)" - #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. @@ -13287,6 +13462,10 @@ msgid " Push URL: %s" msgstr " 推é€ä½å€ï¼š%s" #: builtin/remote.c +msgid "(no URL)" +msgstr "(ç„¡ URL)" + +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" @@ -13421,11 +13600,6 @@ msgid "return all URLs" msgstr "返回所有 URL ä½å€" #: builtin/remote.c -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "沒有給é 端版本庫 '%s' è¨å®š URL" - -#: builtin/remote.c msgid "manipulate push URLs" msgstr "å‹•ä½œæŽ¨é€ URLS" @@ -13632,7 +13806,7 @@ msgstr "ä¸èƒ½åˆªé™¤çå“版本庫ä¸çš„å°åŒ…" #: builtin/repack.c #, c-format msgid "option '%s' can only be used along with '%s'" -msgstr "“%s†é¸é …åªèƒ½èˆ‡ “%s†一起使用" +msgstr "「%sã€é¸é …åªèƒ½èˆ‡ã€Œ%sã€ä¸€èµ·ä½¿ç”¨" #: builtin/repack.c msgid "Nothing new to pack." @@ -13646,7 +13820,7 @@ msgstr "無法將包é‡æ–°å‘½å為「%sã€" #: builtin/repack.c #, c-format msgid "pack-objects did not write a '%s' file for pack %s-%s" -msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s†檔案" +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$sã€æª”案" #: builtin/repack.c sequencer.c #, c-format @@ -13955,7 +14129,7 @@ msgstr "å¿…é ˆå‚³å…¥ --onto 或 --advance é¸é …" msgid "" "some rev walking options will be overridden as '%s' bit in 'struct rev_info' " "will be forced" -msgstr "將覆寫部分修訂版éæ·é¸é …，強制使用 “struct rev_info†的 “%s†ä½å…ƒ" +msgstr "將覆寫部分修訂版éæ·é¸é …，強制使用「struct rev_infoã€çš„「%sã€ä½å…ƒ" #: builtin/replay.c msgid "error preparing revisions" @@ -14345,7 +14519,7 @@ msgstr "已棄用：請改用 --empty=keep" #: builtin/revert.c msgid "use the 'reference' format to refer to commits" -msgstr "請使用 “referenceâ€ æ ¼å¼åƒè€ƒæ交" +msgstr "請使用「referenceã€æ ¼å¼åƒè€ƒæ交" #: builtin/revert.c msgid "revert failed" @@ -14669,12 +14843,12 @@ msgstr "未知的雜湊算法" #: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" msgstr "" "git show-ref [--head] [-d | --dereference]\n" -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" -" [--heads] [--] [<pattern>...]" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n" +" [--] [<pattern>...]" #: builtin/show-ref.c msgid "" @@ -14703,12 +14877,12 @@ msgid "failed to look up reference" msgstr "無法查詢引用" #: builtin/show-ref.c -msgid "only show tags (can be combined with heads)" -msgstr "åªé¡¯ç¤ºæ¨™ç±¤ï¼ˆå¯ä»¥å’Œé 共用）" +msgid "only show tags (can be combined with branches)" +msgstr "åªé¡¯ç¤ºæ¨™ç±¤ï¼ˆå¯ä»¥å’Œåˆ†æ”¯å…±ç”¨ï¼‰" #: builtin/show-ref.c -msgid "only show heads (can be combined with tags)" -msgstr "åªé¡¯ç¤ºé （å¯ä»¥å’Œæ¨™ç±¤å…±ç”¨ï¼‰" +msgid "only show branches (can be combined with tags)" +msgstr "åªé¡¯ç¤ºåˆ†æ”¯ï¼ˆå¯ä»¥å’Œæ¨™ç±¤å…±ç”¨ï¼‰" #: builtin/show-ref.c msgid "check for reference existence without resolving" @@ -15440,7 +15614,7 @@ msgstr "" #: builtin/submodule--helper.c #, c-format msgid "could not get a repository handle for gitdir '%s'" -msgstr "無法å–å¾— gitdir “%s†的版本庫控點" +msgstr "無法å–å¾— gitdir「%sã€çš„版本庫控點" #: builtin/submodule--helper.c #, c-format @@ -15457,20 +15631,20 @@ msgstr "ä¸èƒ½è˜åˆ¥ submodule.alternateErrorStrategy çš„å–值 '%s'" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "ä¸èƒ½è˜åˆ¥ submodule.alternateLocation çš„å–值 '%s'" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c submodule.c #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒絕在其他å模組的 git 路徑建立ï¼ä½¿ç”¨ã€Œ%sã€" #: builtin/submodule--helper.c #, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到å模組路徑 '%s'" +msgid "directory not empty: '%s'" +msgstr "目錄ä¸æ˜¯ç©ºçš„：「%sã€" #: builtin/submodule--helper.c #, c-format -msgid "directory not empty: '%s'" -msgstr "目錄ä¸æ˜¯ç©ºçš„：「%sã€" +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "無法複製 '%s' 到å模組路徑 '%s'" #: builtin/submodule--helper.c #, c-format @@ -15542,7 +15716,7 @@ msgstr "ç•¥éŽå模組 '%s'" #: builtin/submodule--helper.c #, c-format msgid "cannot clone submodule '%s' without a URL" -msgstr "無法在沒有網å€çš„情æ³ä¸‹è¤‡è£½ “%s†å模組" +msgstr "無法在沒有網å€çš„情æ³ä¸‹è¤‡è£½ã€Œ%sã€å模組" #: builtin/submodule--helper.c #, c-format @@ -15660,15 +15834,15 @@ msgstr "ä¸å¾žé 端站å°å–得新物件" #: builtin/submodule--helper.c msgid "use the 'checkout' update strategy (default)" -msgstr "使用 “checkout†更新ç–略（é è¨å€¼ï¼‰" +msgstr "使用「checkoutã€æ›´æ–°ç–略（é è¨å€¼ï¼‰" #: builtin/submodule--helper.c msgid "use the 'merge' update strategy" -msgstr "使用 “merge†更新ç–ç•¥" +msgstr "使用「mergeã€æ›´æ–°ç–ç•¥" #: builtin/submodule--helper.c msgid "use the 'rebase' update strategy" -msgstr "使用 “rebase†更新ç–ç•¥" +msgstr "使用「rebaseã€æ›´æ–°ç–ç•¥" #: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" @@ -15911,9 +16085,11 @@ msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" " <tagname> [<commit> | <object>]" #: builtin/tag.c @@ -16081,7 +16257,7 @@ msgstr "åªåˆ—å°æŒ‡å‘該物件的標籤" #: builtin/tag.c msgid "could not start 'git column'" -msgstr "無法啟動 “git columnâ€" +msgstr "無法啟動「git columnã€" #: builtin/tag.c #, c-format @@ -16511,7 +16687,7 @@ msgstr "git worktree unlock <worktree>" #: builtin/worktree.c msgid "No possible source branch, inferring '--orphan'" -msgstr "沒有å¯èƒ½çš„來æºåˆ†æ”¯ï¼ŒæŽ¨æ¸¬ç‚º “--orphanâ€" +msgstr "沒有å¯èƒ½çš„來æºåˆ†æ”¯ï¼ŒæŽ¨æ¸¬ç‚ºã€Œ--orphanã€" #: builtin/worktree.c #, c-format @@ -16646,8 +16822,8 @@ msgid "" "HEAD contents: '%s'" msgstr "" "HEAD 指å‘無效（或å¤ç«‹ï¼‰å¼•ç”¨ã€‚\n" -"HEAD 路徑：“%sâ€\n" -"HEAD 內容：“%sâ€" +"HEAD 路徑：「%sã€\n" +"HEAD 內容：「%sã€" #: builtin/worktree.c msgid "" @@ -16655,7 +16831,7 @@ msgid "" "present, stopping; use 'add -f' to override or fetch a remote first" msgstr "" "å³ä½¿æœ‰æ供一個é 端，å»ä¸å˜åœ¨æœ¬æ©Ÿæˆ–é 端引用，\n" -"æ•…åœæ¢ã€‚使用 “add -f†先覆蓋或抓å–é 端" +"æ•…åœæ¢ã€‚使用「add -fã€å…ˆè¦†è“‹æˆ–抓å–é 端" #: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" @@ -16866,12 +17042,12 @@ msgstr "core.fsyncMethod = batch ä¸æ”¯æ´æœ¬å¹³å°" #: bundle-uri.c #, c-format msgid "could not parse bundle list key %s with value '%s'" -msgstr "無法解æžå¥—ä»¶åŒ…æ¸…å–®éµ %s 的值 “%sâ€" +msgstr "無法解æžå¥—ä»¶åŒ…æ¸…å–®éµ %s 的值「%sã€" #: bundle-uri.c #, c-format msgid "bundle list at '%s' has no mode" -msgstr "ä½æ–¼ “%s†的套件包清單沒有模å¼" +msgstr "ä½æ–¼ã€Œ%sã€çš„套件包清單沒有模å¼" #: bundle-uri.c msgid "failed to create temporary file" @@ -16884,7 +17060,7 @@ msgstr "功能ä¸è¶³" #: bundle-uri.c #, c-format msgid "file downloaded from '%s' is not a bundle" -msgstr "從 “%s†下載的檔案ä¸æ˜¯å¥—件包" +msgstr "從「%sã€ä¸‹è¼‰çš„檔案ä¸æ˜¯å¥—件包" #: bundle-uri.c msgid "failed to store maximum creation token" @@ -16893,7 +17069,7 @@ msgstr "無法儲å˜æœ€å¤§çš„建立權æ–" #: bundle-uri.c #, c-format msgid "unrecognized bundle mode from URI '%s'" -msgstr "無法è˜åˆ¥å¾ž URI “%s†å–回的套件包模å¼" +msgstr "無法è˜åˆ¥å¾ž URI「%sã€å–回的套件包模å¼" #: bundle-uri.c #, c-format @@ -16903,17 +17079,17 @@ msgstr "超出套件包 URI éžè¿´é™åˆ¶ (%d)" #: bundle-uri.c #, c-format msgid "failed to download bundle from URI '%s'" -msgstr "無法從 “%s†URI 下載套件包" +msgstr "無法從「%sã€URI 下載套件包" #: bundle-uri.c #, c-format msgid "file at URI '%s' is not a bundle or bundle list" -msgstr "ä½æ–¼ URI “%s†的檔案ä¸æ˜¯å¥—件包或套件包清單" +msgstr "ä½æ–¼ URI「%sã€çš„檔案ä¸æ˜¯å¥—件包或套件包清單" #: bundle-uri.c #, c-format msgid "bundle-uri: unexpected argument: '%s'" -msgstr "bundle-uri: éžé 期的引數：“%sâ€" +msgstr "bundle-uri: éžé 期的引數：「%sã€" #: bundle-uri.c msgid "bundle-uri: expected flush after arguments" @@ -16925,7 +17101,7 @@ msgstr "bundle-uri: 收到空白列" #: bundle-uri.c msgid "bundle-uri: line is not of the form 'key=value'" -msgstr "bundle-uri: åˆ—çš„æ ¼å¼ä¸æ˜¯ “key=valueâ€" +msgstr "bundle-uri: åˆ—çš„æ ¼å¼ä¸æ˜¯ã€Œkey=valueã€" #: bundle-uri.c msgid "bundle-uri: line has empty key or value" @@ -16944,7 +17120,7 @@ msgstr "未知功能「%sã€" #: bundle.c #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "“%s†ä¸åƒæ˜¯ä¸€å€‹ v2 或 v3 版本的套件包檔案" +msgstr "「%sã€ä¸åƒæ˜¯ä¸€å€‹ v2 或 v3 版本的套件包檔案" #: bundle.c #, c-format @@ -16956,10 +17132,6 @@ msgid "Repository lacks these prerequisite commits:" msgstr "版本庫ä¸ç¼ºå°‘這些必備的æ交：" #: bundle.c -msgid "need a repository to verify a bundle" -msgstr "需è¦ç‰ˆæœ¬åº«é©—è‰å¥—件包" - -#: bundle.c msgid "" "some prerequisite commits exist in the object store, but are not connected " "to the repository's history" @@ -17478,6 +17650,10 @@ msgid "Manage reflog information" msgstr "ç®¡ç† reflog 訊æ¯" #: command-list.h +msgid "Low-level access to refs" +msgstr "å°å¼•ç”¨çš„低階å˜å–" + +#: command-list.h msgid "Manage set of tracked repositories" msgstr "管ç†å·²è¿½è¹¤ç‰ˆæœ¬åº«" @@ -17572,7 +17748,7 @@ msgstr "將工作å€é™ç¸®è‡³åªåŒ…å«è¿½è¹¤æª”案的å集" #: command-list.h msgid "Add file contents to the staging area" -msgstr "將檔案內容新增到索引" +msgstr "將檔案內容新增到暫å˜å€" #: command-list.h msgid "Stash the changes in a dirty working directory away" @@ -17720,7 +17896,7 @@ msgstr "Git å°åŒ…æ ¼å¼" #: command-list.h msgid "Git cryptographic signature formats" -msgstr "Git 密碼編è¯ç°½ç« æ ¼å¼" +msgstr "Git 數ä½ç°½ç« æ ¼å¼" #: command-list.h msgid "A Git Glossary" @@ -17808,104 +17984,111 @@ msgstr "用來管ç†å¤§åž‹ Git 版本庫的工具" #: commit-graph.c msgid "commit-graph file is too small" -msgstr "æ交圖形檔案太å°" +msgstr "æ交圖檔案太å°" #: commit-graph.c msgid "commit-graph oid fanout chunk is wrong size" -msgstr "æ交圖形 OID 扇出å€å¡Šå¤§å°æœ‰èª¤" +msgstr "æ交圖 OID 扇出å€å¡Šå¤§å°æœ‰èª¤" #: commit-graph.c msgid "commit-graph fanout values out of order" -msgstr "æ交圖形扇出的數值失åº" +msgstr "æ交圖扇出的數值失åº" #: commit-graph.c msgid "commit-graph OID lookup chunk is the wrong size" -msgstr "æ交圖形 OID 查詢å€å¡Šçš„大å°æœ‰èª¤" +msgstr "æ交圖 OID 查詢å€å¡Šçš„大å°æœ‰èª¤" #: commit-graph.c msgid "commit-graph commit data chunk is wrong size" -msgstr "æ交圖形的æ交資料å€å¡Šå¤§å°æœ‰èª¤" +msgstr "æ交圖的æ交資料å€å¡Šå¤§å°æœ‰èª¤" #: commit-graph.c msgid "commit-graph generations chunk is wrong size" -msgstr "æ交圖形的世代å€å¡Šå¤§å°æœ‰èª¤" +msgstr "æ交圖的世代å€å¡Šå¤§å°æœ‰èª¤" #: commit-graph.c msgid "commit-graph changed-path index chunk is too small" -msgstr "æ交圖形的更動路徑索引å€å¡ŠéŽå°" +msgstr "æ交圖的更動路徑索引å€å¡ŠéŽå°" #: commit-graph.c #, c-format msgid "" "ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-" "graph file" -msgstr "忽略æ交圖形檔案ä¸éŽå°çš„更動路徑å€å¡Š (%<PRIuMAX> < %<PRIuMAX>)" +msgstr "忽略æ交圖檔案ä¸éŽå°çš„更動路徑å€å¡Šï¼ˆ%<PRIuMAX> < %<PRIuMAX>）" #: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "æ交圖形簽å %X 和簽å %X ä¸ç¬¦åˆ" +msgstr "æäº¤åœ–ç°½ç« %X å’Œç°½ç« %X ä¸ç¬¦" #: commit-graph.c #, c-format msgid "commit-graph version %X does not match version %X" -msgstr "æ交圖形版本 %X 和版本 %X ä¸ç¬¦åˆ" +msgstr "æ交圖版本 %X 和版本 %X ä¸ç¬¦" #: commit-graph.c #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "æ交圖形雜湊版本 %X 和版本 %X ä¸ç¬¦åˆ" +msgstr "æ交圖雜湊版本 %X 和版本 %X ä¸ç¬¦" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "æ交圖形檔案ä¸å¤ 放置 %u 個å€å¡Š" +msgstr "æ交圖檔案ä¸å¤ 放置 %u 個å€å¡Š" #: commit-graph.c msgid "commit-graph required OID fanout chunk missing or corrupted" -msgstr "æ交圖形需è¦çš„ OID 扇出å€å¡Šéºå¤±æˆ–æ壞" +msgstr "æ交圖需è¦çš„ OID 扇出å€å¡Šéºå¤±æˆ–æ壞" #: commit-graph.c msgid "commit-graph required OID lookup chunk missing or corrupted" -msgstr "æ交圖形需è¦çš„ OID 查詢å€å¡Šéºå¤±æˆ–æ壞" +msgstr "æ交圖需è¦çš„ OID 查詢å€å¡Šéºå¤±æˆ–æ壞" #: commit-graph.c msgid "commit-graph required commit data chunk missing or corrupted" -msgstr "æ交圖形需è¦çš„æ交資料å€å¡Šéºå¤±æˆ–æ壞" +msgstr "æ交圖需è¦çš„æ交資料å€å¡Šéºå¤±æˆ–æ壞" + +#: commit-graph.c +#, c-format +msgid "" +"disabling Bloom filters for commit-graph layer '%s' due to incompatible " +"settings" +msgstr "由於ä¸ç›¸å®¹çš„è¨å®šï¼Œåœç”¨æ交圖層 '%s' 的布隆éŽæ¿¾å™¨" #: commit-graph.c msgid "commit-graph has no base graphs chunk" -msgstr "æ交圖形沒有基礎圖形å€å¡Š" +msgstr "æ交圖沒有基礎圖å€å¡Š" #: commit-graph.c msgid "commit-graph base graphs chunk is too small" -msgstr "æ交圖形的基礎圖形å€å¡ŠéŽå°" +msgstr "æ交圖的基礎圖å€å¡ŠéŽå°" #: commit-graph.c msgid "commit-graph chain does not match" -msgstr "æ交圖形éˆä¸ç¬¦åˆ" +msgstr "æ交圖éˆä¸ç¬¦" #: commit-graph.c #, c-format msgid "commit count in base graph too high: %<PRIuMAX>" -msgstr "基礎圖 (base graph) ä¸çš„æ交數éŽå¤šï¼š%<PRIuMAX>" +msgstr "基礎圖ä¸çš„æ交數éŽå¤šï¼š%<PRIuMAX>" #: commit-graph.c msgid "commit-graph chain file too small" -msgstr "æ交圖形éˆæª”案éŽå°" +msgstr "æ交圖éˆæª”案éŽå°" #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的æ交圖形éˆï¼šã€Œ%sã€åˆ—ä¸æ˜¯é›œæ¹Šå€¼" +msgstr "無效的æ交圖éˆï¼šã€Œ%sã€åˆ—ä¸æ˜¯é›œæ¹Šå€¼" #: commit-graph.c msgid "unable to find all commit-graph files" -msgstr "無法找到所有æ交圖形檔案" +msgstr "無法找到所有æ交圖檔案" #: commit-graph.c msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "無效的æ交ä½ç½®ã€‚æ交圖形å¯èƒ½å·²æ壞" +msgstr "無效的æ交ä½ç½®ã€‚æ交圖å¯èƒ½å·²æ壞" #: commit-graph.c #, c-format @@ -17914,15 +18097,15 @@ msgstr "無法找到æ交 %s" #: commit-graph.c msgid "commit-graph requires overflow generation data but has none" -msgstr "æ交圖需è¦æ¯”ç›®å‰æ›´å¤šçš„世代資料，但沒有相關資料" +msgstr "缺少æ交圖需è¦çš„溢ä½ä¸–代資料" #: commit-graph.c msgid "commit-graph overflow generation data is too small" -msgstr "æ交圖形的溢出世代資料éŽå°" +msgstr "æ交圖的溢ä½ä¸–代資料éŽå°" #: commit-graph.c msgid "commit-graph extra-edges pointer out of bounds" -msgstr "æ交圖形的延伸邊界指é‡è¶…出範åœ" +msgstr "æ交圖é¡å¤–的邊指標超出範åœ" #: commit-graph.c msgid "Loading known commits in commit graph" @@ -17930,7 +18113,7 @@ msgstr "æ£åœ¨è¼‰å…¥æ交圖ä¸çš„已知æ交" #: commit-graph.c msgid "Expanding reachable commits in commit graph" -msgstr "æ£åœ¨å±•é–‹æ交圖ä¸çš„å¯ä»¥å–å¾—çš„æ交" +msgstr "æ£åœ¨å±•é–‹æ交圖ä¸çš„å¯è§¸åŠæ交" #: commit-graph.c msgid "Clearing commit marks in commit graph" @@ -17938,11 +18121,11 @@ msgstr "æ£åœ¨æ¸…除æ交圖ä¸çš„æ交標記" #: commit-graph.c msgid "Computing commit graph topological levels" -msgstr "æ£åœ¨è¨ˆç®—æ交圖拓樸級別" +msgstr "æ£åœ¨è¨ˆç®—æ交圖的拓樸層級" #: commit-graph.c msgid "Computing commit graph generation numbers" -msgstr "æ£åœ¨è¨ˆç®—æ交圖世代數å—" +msgstr "æ£åœ¨è¨ˆç®—æ交圖的世代數" #: commit-graph.c msgid "Computing commit changed paths Bloom filters" @@ -17970,7 +18153,7 @@ msgstr "為 %s 開啟索引發生錯誤" #: commit-graph.c msgid "Finding commits for commit graph among packed objects" -msgstr "æ£åœ¨æ‰“包物件ä¸å°‹æ‰¾æ交圖的æ交" +msgstr "æ£åœ¨å¾žæ‰“包物件ä¸å°‹æ‰¾æ交圖的æ交" #: commit-graph.c msgid "Finding extra edges in commit graph" @@ -17978,11 +18161,11 @@ msgstr "æ£åœ¨å°‹æ‰¾æ交圖ä¸é¡å¤–çš„é‚Š" #: commit-graph.c msgid "failed to write correct number of base graph ids" -msgstr "無法寫入æ£ç¢ºæ•¸é‡çš„基礎圖形 ID" +msgstr "無法寫入æ£ç¢ºæ•¸é‡çš„基礎圖 ID" #: commit-graph.c msgid "unable to create temporary graph layer" -msgstr "無法建立暫時的圖形層" +msgstr "無法建立暫時性圖層" #: commit-graph.c #, c-format @@ -17997,25 +18180,25 @@ msgstr[0] "æ£åœ¨ç”¨ %d æ¥å¯«å‡ºæ交圖" #: commit-graph.c msgid "unable to open commit-graph chain file" -msgstr "無法開啟æ交圖形éˆæª”案" +msgstr "無法開啟æ交圖éˆæª”案" #: commit-graph.c msgid "failed to rename base commit-graph file" -msgstr "無法é‡æ–°å‘½å基礎æ交圖形檔案" +msgstr "無法é‡æ–°å‘½å基礎æ交圖檔案" #: commit-graph.c msgid "failed to rename temporary commit-graph file" -msgstr "無法é‡æ–°å‘½å暫時æ交圖形檔案" +msgstr "無法é‡æ–°å‘½å暫時性æ交圖檔案" #: commit-graph.c #, c-format msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits" -msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個æ交進行åˆä½µ" +msgstr "無法åˆä½µåœ–，兩者分別有 %<PRIuMAX>ã€%<PRIuMAX> 個æ交" #: commit-graph.c #, c-format msgid "cannot merge graph %s, too many commits: %<PRIuMAX>" -msgstr "無法åˆä½µ %s 圖，太多æ交：%<PRIuMAX>" +msgstr "無法åˆä½µåœ– %s，太多æ交：%<PRIuMAX>" #: commit-graph.c msgid "Scanning merged commits" @@ -18023,15 +18206,22 @@ msgstr "æ£åœ¨æŽƒæåˆä½µæ交" #: commit-graph.c msgid "Merging commit-graph" -msgstr "æ£åœ¨åˆä½µæ交圖形" +msgstr "æ£åœ¨åˆä½µæ交圖" #: commit-graph.c msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "嘗試寫入æ交圖形，但 “core.commitGraph†已被åœç”¨" +msgstr "嘗試寫入æ交圖，但「core.commitGraphã€å·²åœç”¨" + +#: commit-graph.c +#, c-format +msgid "" +"attempting to write a commit-graph, but 'commitGraph." +"changedPathsVersion' (%d) is not supported" +msgstr "嘗試寫入æ交圖，但ä¸æ”¯æ´ã€ŒcommitGraph.changedPathsVersionã€ï¼ˆ%d）" #: commit-graph.c msgid "too many commits to write graph" -msgstr "æ交太多ä¸èƒ½ç•«åœ–" +msgstr "æ交éŽå¤šç„¡æ³•ç•«åœ–" #: commit-graph.c msgid "the commit-graph file has incorrect checksum and is likely corrupt" @@ -18040,59 +18230,59 @@ msgstr "æ交圖檔案的總和檢查碼錯誤，å¯èƒ½å·²ç¶“æ壞" #: commit-graph.c #, c-format msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "æ交圖形的物件 ID é †åºä¸æ£ç¢ºï¼š%s 然後 %s" +msgstr "æ交圖的物件 ID é †åºä¸æ£ç¢ºï¼š%s 然後 %s" #: commit-graph.c #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "æ交圖形有ä¸æ£ç¢ºçš„扇出值：fanout[%d] = %u != %u" +msgstr "æ交圖有ä¸æ£ç¢ºçš„扇出值：fanout[%d] = %u != %u" #: commit-graph.c #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "無法從æ交圖形ä¸è§£æžæ交 %s" +msgstr "無法從æ交圖ä¸è§£æžæ交 %s" #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "無法從æ交圖形的物件庫ä¸è§£æžæ交 %s" +msgstr "無法從æ交圖的物件資料庫ä¸è§£æžæ交 %s" #: commit-graph.c #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "æ交圖形ä¸çš„æ交 %s çš„æ ¹æ¨¹ç‹€ç‰©ä»¶ ID 是 %s != %s" +msgstr "æ交圖ä¸çš„æ交 %s çš„æ ¹æ¨¹ç‹€ç‰©ä»¶ ID 是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "æ交 %s çš„æ交圖形父æ交列表太長了" +msgstr "æ交 %s çš„æ交圖上級清單éŽé•·" #: commit-graph.c #, c-format msgid "commit-graph parent for %s is %s != %s" -msgstr "%s çš„æ交圖形父æ交是 %s != %s" +msgstr "%s çš„æ交圖上級是 %s != %s" #: commit-graph.c #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "æ交 %s çš„æ交圖形父æ交列表éŽæ—©çµ‚æ¢" +msgstr "æ交 %s çš„æ交圖上級清單éŽæ—©çµ‚æ¢" #: commit-graph.c #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "æ交 %s çš„æ交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" +msgstr "æ交 %s ä½æ–¼ %<PRIuMAX> < %<PRIuMAX> æ交圖世代" #: commit-graph.c #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "æ交圖形ä¸æ交 %s çš„æ交日期是 %<PRIuMAX> != %<PRIuMAX>" +msgstr "æ交圖ä¸çš„æ交 %s æ交日期是 %<PRIuMAX> != %<PRIuMAX>" #: commit-graph.c #, c-format msgid "" "commit-graph has both zero and non-zero generations (e.g., commits '%s' and " "'%s')" -msgstr "æ交圖形ä¸åŒ…å« 0 å’Œéž 0 兩個世代號（例如 “%s†和 “%s†æ交）" +msgstr "æ交圖ä¸åŒ…å« 0 å’Œéž 0 兩個世代數（例如æ交「%sã€å’Œã€Œ%sã€ï¼‰" #: commit-graph.c msgid "Verifying commits in commit graph" @@ -18131,7 +18321,7 @@ msgstr "" #: commit.c #, c-format msgid "commit %s exists in commit-graph but not in the object database" -msgstr "%s æ交在æ交圖形ä¸ï¼Œä½†ä¸åœ¨ç‰©ä»¶è³‡æ–™åº«ä¸" +msgstr "%s æ交在æ交圖ä¸ï¼Œä½†ä¸åœ¨ç‰©ä»¶è³‡æ–™åº«ä¸" #: commit.c #, c-format @@ -18174,37 +18364,37 @@ msgstr "沒有å¯ç”¨çš„ libc 資訊\n" #: compat/disk.h #, c-format msgid "could not determine free disk size for '%s'" -msgstr "無法判斷 “%s†的剩餘ç£ç¢Ÿå¤§å°" +msgstr "無法判斷「%sã€çš„剩餘ç£ç¢Ÿå¤§å°" #: compat/disk.h #, c-format msgid "could not get info for '%s'" -msgstr "無法å–å¾— “%s†的資訊" +msgstr "無法å–得「%sã€çš„資訊" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread could not open '%ls'" -msgstr "[GLE %ld] å¥åº·ç›£è½åŸ·è¡Œç·’無法開啟 “%lsâ€" +msgstr "[GLE %ld] å¥åº·ç›£è½åŸ·è¡Œç·’無法開啟「%lsã€" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "[GLE %ld] health thread getting BHFI for '%ls'" -msgstr "[GLE %ld] å¥åº·ç›£è½åŸ·è¡Œç·’å–å¾— “%ls†的 BHFI" +msgstr "[GLE %ld] å¥åº·ç›£è½åŸ·è¡Œç·’å–得「%lsã€çš„ BHFI" #: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "could not convert to wide characters: '%s'" -msgstr "無法轉æ›è‡³è¼ƒå¯¬å—元：“%sâ€" +msgstr "無法轉æ›è‡³è¼ƒå¯¬å—元：「%sã€" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "BHFI changed '%ls'" -msgstr "BHFI 更改了 “%lsâ€" +msgstr "BHFI 更改了「%lsã€" #: compat/fsmonitor/fsm-health-win32.c #, c-format msgid "unhandled case in 'has_worktree_moved': %d" -msgstr "“has_worktree_moved†ä¸æœ‰æœªè™•ç½®çš„情æ³ï¼š%d" +msgstr "「has_worktree_movedã€ä¸æœ‰æœªè™•ç½®çš„情æ³ï¼š%d" #: compat/fsmonitor/fsm-health-win32.c #, c-format @@ -18232,22 +18422,22 @@ msgstr "[GLE %ld] 無法將路徑轉æ›ç‚º UTF-8：「%.*lsã€" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not watch '%s'" -msgstr "[GLE %ld] ç„¡æ³•ç›£è½ â€œ%sâ€" +msgstr "[GLE %ld] 無法監è½ã€Œ%sã€" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "[GLE %ld] could not get longname of '%s'" -msgstr "[GLE %ld] 無法å–å¾— “%s†的 longname" +msgstr "[GLE %ld] 無法å–得「%sã€çš„ longname" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" -msgstr "在 “%sâ€ ä¸Šå‘¼å« ReadDirectoryChangedW 失敗 [GLE %ld]" +msgstr "在「%sã€ä¸Šå‘¼å« ReadDirectoryChangedW 失敗 [GLE %ld]" #: compat/fsmonitor/fsm-listen-win32.c #, c-format msgid "GetOverlappedResult failed on '%s' [GLE %ld]" -msgstr "在 “%sâ€ ä¸Šå‘¼å« GetOverlappedResult 失敗 [GLE %ld]" +msgstr "在「%sã€ä¸Šå‘¼å« GetOverlappedResult 失敗 [GLE %ld]" #: compat/fsmonitor/fsm-listen-win32.c #, c-format @@ -18292,7 +18482,7 @@ msgstr "無法複製 SID (%ld)" #: compat/mingw.c #, c-format msgid "failed to get owner for '%s' (%ld)" -msgstr "無法å–å¾— “%s†的所有者 (%ld)" +msgstr "無法å–得「%sã€çš„所有者 (%ld)" #: compat/obstack.c msgid "memory exhausted" @@ -18381,7 +18571,7 @@ msgstr "ç„¡æ³•è®€å– IPC 回應" #: compat/simple-ipc/ipc-unix-socket.c #, c-format msgid "could not start accept_thread '%s'" -msgstr "無法啟動 accept_thread “%sâ€" +msgstr "無法啟動 accept_thread「%sã€" #: compat/simple-ipc/ipc-unix-socket.c #, c-format @@ -18391,26 +18581,26 @@ msgstr "無法啟動「%sã€çš„ worker[0]" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "ConnectNamedPipe failed for '%s' (%lu)" -msgstr "å° â€œ%s†進行 ConnectNamedPipe 失敗 (%lu)" +msgstr "å°ã€Œ%sã€é€²è¡Œ ConnectNamedPipe 失敗 (%lu)" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not create fd from pipe for '%s'" -msgstr "無法為 “%s†從管é“建立 fd" +msgstr "無法為「%sã€å¾žç®¡é“建立 fd" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "could not start thread[0] for '%s'" -msgstr "無法為 “%s†啟動 thread[0]" +msgstr "無法為「%sã€å•Ÿå‹• thread[0]" #: compat/simple-ipc/ipc-win32.c #, c-format msgid "wait for hEvent failed for '%s'" -msgstr "ç‰å¾… “%s†的 hEvent 失敗" +msgstr "ç‰å¾…「%sã€çš„ hEvent 失敗" #: compat/terminal.c msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "無法在背景繼續；請使用 “fg†繼續" +msgstr "無法在背景繼續；請使用「fgã€ç¹¼çºŒ" #: compat/terminal.c msgid "cannot restore terminal settings" @@ -18602,7 +18792,7 @@ msgstr "%s 變數的值無效" #: config.c #, c-format msgid "ignoring unknown core.fsync component '%s'" -msgstr "忽略未知的 core.fsync 組件「%sã€" +msgstr "忽略未知的 core.fsync 元件「%sã€" #: config.c #, c-format @@ -18778,7 +18968,7 @@ msgstr "無效的å°ç¯€å稱：%s" #: config.c #, c-format msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>" -msgstr "å› ç‚ºç¬¬ %2$<PRIuMAX> åˆ—ä¸ â€œ%1$s†的文å—列太長，故拒絕é‹ä½œ" +msgstr "å› ç‚ºç¬¬ %2$<PRIuMAX> 列ä¸ã€Œ%1$sã€çš„æ–‡å—列太長，故拒絕é‹ä½œ" #: config.c #, c-format @@ -18992,7 +19182,7 @@ msgstr "%s ä¸çš„ CRLF 將被 LF å–代" msgid "" "in the working copy of '%s', CRLF will be replaced by LF the next time Git " "touches it" -msgstr "在 “%s†的工作複本ä¸ï¼Œä¸‹æ¬¡ Git 接觸到時會用 LF å–代 CRLF" +msgstr "在「%sã€çš„工作複本ä¸ï¼Œä¸‹æ¬¡ Git 接觸到時會用 LF å–代 CRLF" #: convert.c #, c-format @@ -19004,7 +19194,7 @@ msgstr "檔案 %s ä¸çš„ LF 將被 CRLF å–代" msgid "" "in the working copy of '%s', LF will be replaced by CRLF the next time Git " "touches it" -msgstr "在 “%s†的工作複本ä¸ï¼Œä¸‹æ¬¡ Git 接觸到時會用 CRLF å–代 LF" +msgstr "在「%sã€çš„工作複本ä¸ï¼Œä¸‹æ¬¡ Git 接觸到時會用 CRLF å–代 LF" #: convert.c #, c-format @@ -19225,7 +19415,7 @@ msgstr "ä¸èƒ½é–‹å•Ÿç›®éŒ„ '%s'" #: diagnose.c #, c-format msgid "skipping '%s', which is neither file nor directory" -msgstr "ç•¥éŽ â€œ%sâ€ï¼Œå…¶éžæª”案或目錄" +msgstr "ç•¥éŽã€Œ%sã€ï¼Œå…¶éžæª”案或目錄" #: diagnose.c msgid "could not duplicate stdout" @@ -19523,7 +19713,7 @@ msgstr "使用æ供的檔案å長度生æˆå·®ç•°çµ±è¨ˆ" #: diff.c msgid "generate diffstat with a given graph width" -msgstr "使用æ供的圖形長度生æˆå·®ç•°çµ±è¨ˆ" +msgstr "產出é™åˆ¶ç‚ºæ供的寬度的差異統計圖形" #: diff.c msgid "<count>" @@ -20159,7 +20349,7 @@ msgstr "é 期 '%s'，得到 '%s'" #: fetch-pack.c #, c-format msgid "expected '%s'" -msgstr "é 期 “%sâ€" +msgstr "é 期「%sã€" #: fetch-pack.c #, c-format @@ -20251,45 +20441,49 @@ msgstr "無法將「%sã€å‘½ä»¤å‚³é€åˆ° fsmonitor--daemon" #: fsmonitor-settings.c #, c-format msgid "bare repository '%s' is incompatible with fsmonitor" -msgstr "純版本庫 “%s†與 fsmonitor ä¸ç›¸å®¹" +msgstr "純版本庫「%sã€èˆ‡ fsmonitor ä¸ç›¸å®¹" #: fsmonitor-settings.c #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" -msgstr "版本庫 “%sâ€ å› éŒ¯èª¤è€Œèˆ‡ fsmonitor ä¸ç›¸å®¹" +msgstr "版本庫「%sã€å› 錯誤而與 fsmonitor ä¸ç›¸å®¹" #: fsmonitor-settings.c #, c-format msgid "remote repository '%s' is incompatible with fsmonitor" -msgstr "é 端版本庫 “%s†與 fsmonitor ä¸ç›¸å®¹" +msgstr "é 端版本庫「%sã€èˆ‡ fsmonitor ä¸ç›¸å®¹" #: fsmonitor-settings.c #, c-format msgid "virtual repository '%s' is incompatible with fsmonitor" -msgstr "虛擬版本庫 “%s†與 fsmonitor ä¸ç›¸å®¹" +msgstr "虛擬版本庫「%sã€èˆ‡ fsmonitor ä¸ç›¸å®¹" #: fsmonitor-settings.c #, c-format msgid "" "socket directory '%s' is incompatible with fsmonitor due to lack of Unix " "sockets support" -msgstr "通訊端 “%sâ€ å› ç¼ºå°‘ Unix 通訊端支æ´ï¼Œè€Œèˆ‡ fsmonitor ä¸ç›¸å®¹" +msgstr "通訊端「%sã€å› 缺少 Unix 通訊端支æ´ï¼Œè€Œèˆ‡ fsmonitor ä¸ç›¸å®¹" #: git.c msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--config-env=<name>=<envvar>] <command> [<args>]" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-" +"lazy-fetch]\n" +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n" +" [--work-tree=<path>] [--namespace=<name>] [--config-" +"env=<name>=<envvar>]\n" +" <command> [<args>]" #: git.c msgid "" @@ -20493,7 +20687,7 @@ msgstr "無法從「%sã€è®€å– SSH ç°½å資料緩è¡å€" #: graph.c #, c-format msgid "ignored invalid color '%.*s' in log.graphColors" -msgstr "已忽略 log.graphColors ä¸ç„¡æ•ˆçš„ “%.*s†色彩" +msgstr "已忽略 log.graphColors ä¸ç„¡æ•ˆçš„「%.*sã€è‰²å½©" #: grep.c msgid "" @@ -20689,14 +20883,14 @@ msgstr "" "è¨å®š `git config advice.ignoredHook false` 來關閉這æ¢è¦å‘Šã€‚" #: http-fetch.c +msgid "not a git repository" +msgstr "ä¸æ˜¯ä¸€å€‹ git 版本庫" + +#: http-fetch.c #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "傳入 --packfile çš„åƒæ•¸å¿…é ˆæ˜¯æœ‰æ•ˆçš„é›œæ¹Š (收到 '%s')" -#: http-fetch.c -msgid "not a git repository" -msgstr "ä¸æ˜¯ä¸€å€‹ git 版本庫" - #: http.c #, c-format msgid "negative value for http.postBuffer; defaulting to %d" @@ -20711,6 +20905,10 @@ msgid "Public key pinning not supported with cURL < 7.39.0" msgstr "ä¸æ”¯æ´å…¬é‘°æª”æ¡ˆéŽ–å®šï¼Œå› ç‚º cURL < 7.39.0" #: http.c +msgid "Unknown value for http.proactiveauth" +msgstr "http.proactiveauth 的值未知" + +#: http.c msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "ä¸æ”¯æ´ CURLSSLOPT_NO_REVOKEï¼Œå› ç‚º cURL < 7.44.0" @@ -20730,6 +20928,14 @@ msgid "Could not set SSL backend to '%s': already set" msgstr "無法將 SSL 後端è¨å®šç‚º '%s'：已經è¨å®š" #: http.c +msgid "refusing to read cookies from http.cookiefile '-'" +msgstr "ä¸å…許從 http.cookiefile çš„è¨å®šå€¼ã€Œ-ã€è™•è®€å– cookie" + +#: http.c +msgid "ignoring http.savecookies for empty http.cookiefile" +msgstr "http.cookiefile 空白，忽略 http.savecookies" + +#: http.c #, c-format msgid "" "unable to update url base from redirection:\n" @@ -20813,7 +21019,7 @@ msgstr "sparse:path éŽæ¿¾å™¨æ”¯æ´å·²è¢«åˆªé™¤" #: list-objects-filter-options.c #, c-format msgid "'%s' for 'object:type=<type>' is not a valid object type" -msgstr "“object:type=<type>†的 “%s†ä¸æ˜¯æœ‰æ•ˆçš„ç‰©ä»¶æ ¼å¼" +msgstr "「object:type=<type>ã€çš„「%sã€ä¸æ˜¯æœ‰æ•ˆçš„ç‰©ä»¶æ ¼å¼" #: list-objects-filter-options.c #, c-format @@ -20937,10 +21143,10 @@ msgstr "無法åˆä½µ %s å模組（沒有åˆä½µåŸºåº•ï¼‰" msgid "Failed to merge submodule %s (commits not present)" msgstr "無法åˆä½µå模組 %s（æ交ä¸å˜åœ¨ï¼‰" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "Failed to merge submodule %s (repository corrupt)" -msgstr "無法åˆä½µå模組 %s （版本庫æ壞）" +msgid "error: failed to merge submodule %s (repository corrupt)" +msgstr "錯誤：無法åˆä½µå模組 %s （版本庫æ壞）" #: merge-ort.c merge-recursive.c #, c-format @@ -20972,14 +21178,15 @@ msgstr "" "無法åˆä½µ %s å模組，但有找到幾個å¯è¡Œçš„åˆä½µæ–¹æ¡ˆï¼š\n" "%s" -#: merge-ort.c merge-recursive.c -msgid "failed to execute internal merge" -msgstr "無法執行內部åˆä½µ" +#: merge-ort.c +#, c-format +msgid "error: failed to execute internal merge for %s" +msgstr "éŒ¯èª¤ï¼šç„¡æ³•å° %s 執行內部åˆä½µ" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "unable to add %s to database" -msgstr "無法將 %s åŠ é€²è³‡æ–™åº«" +msgid "error: unable to add %s to database" +msgstr "錯誤：無法將 %s åŠ é€²è³‡æ–™åº«" #: merge-ort.c merge-recursive.c #, c-format @@ -21079,15 +21286,15 @@ msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "è¡çªï¼ˆé‡æ–°å‘½å/刪除）：%1$s å·²é‡æ–°å‘½å為 %3$s ä¸çš„ %2$s å»åœ¨ %4$s ä¸è¢«åˆªé™¤ã€‚" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "cannot read object %s" -msgstr "ä¸èƒ½è®€å–物件 %s" +msgid "error: cannot read object %s" +msgstr "錯誤：無法讀å–物件 %s" -#: merge-ort.c merge-recursive.c +#: merge-ort.c #, c-format -msgid "object %s is not a blob" -msgstr "物件 %s ä¸æ˜¯ä¸€å€‹è³‡æ–™ç‰©ä»¶" +msgid "error: object %s is not a blob" +msgstr "錯誤：物件 %s ä¸æ˜¯ä¸€å€‹è³‡æ–™ç‰©ä»¶" #: merge-ort.c #, c-format @@ -21243,6 +21450,11 @@ msgstr "ä¸çŸ¥é“å¦‚ä½•è™•ç† %06o %s '%s'" #: merge-recursive.c #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "無法åˆä½µå模組 %s （版本庫æ壞）" + +#: merge-recursive.c +#, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "å模組 %s 快轉到如下æ交：" @@ -21287,6 +21499,15 @@ msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法åˆä½µå模組 %s （發ç¾å¤šå€‹åˆä½µï¼‰" #: merge-recursive.c +msgid "failed to execute internal merge" +msgstr "無法執行內部åˆä½µ" + +#: merge-recursive.c +#, c-format +msgid "unable to add %s to database" +msgstr "無法將 %s åŠ é€²è³‡æ–™åº«" + +#: merge-recursive.c #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "錯誤：拒絕éºå¤±æœªè¿½è¹¤æª”案 '%s'，而是寫入 %s。" @@ -21401,6 +21622,16 @@ msgstr "" "命å目錄 %4$s->%5$s" #: merge-recursive.c +#, c-format +msgid "cannot read object %s" +msgstr "ä¸èƒ½è®€å–物件 %s" + +#: merge-recursive.c +#, c-format +msgid "object %s is not a blob" +msgstr "物件 %s ä¸æ˜¯ä¸€å€‹è³‡æ–™ç‰©ä»¶" + +#: merge-recursive.c msgid "modify" msgstr "修改" @@ -21504,10 +21735,6 @@ msgid "malformed line: %s" msgstr "æ©«åˆ—æ ¼å¼éŒ¯èª¤ï¼š%s" #: midx-write.c -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略ç¾æœ‰çš„多包索引：總和檢查碼ä¸ç¬¦" - -#: midx-write.c msgid "could not load pack" msgstr "無法載入包" @@ -21517,6 +21744,10 @@ msgid "could not open index for %s" msgstr "無法開啟 %s 的索引" #: midx-write.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略ç¾æœ‰çš„多包索引：總和檢查碼ä¸ç¬¦" + +#: midx-write.c msgid "Adding packfiles to multi-pack-index" msgstr "æ£åœ¨æ–°å¢ž packfile 至多包索引" @@ -22254,6 +22485,20 @@ msgid "hash mismatch %s" msgstr "雜湊值與 %s ä¸ç¬¦åˆ" #: pack-bitmap-write.c +#, c-format +msgid "duplicate entry when writing bitmap index: %s" +msgstr "寫入ä½åœ–索引ä¸æ™‚發ç¾é‡è¤‡é …目：%s" + +#: pack-bitmap-write.c +#, c-format +msgid "attempted to store non-selected commit: '%s'" +msgstr "嘗試儲å˜æœªé¸å–çš„æ交：「%sã€" + +#: pack-bitmap-write.c +msgid "too many pseudo-merges" +msgstr "å½åˆä½µéŽå¤š" + +#: pack-bitmap-write.c msgid "trying to write commit not in index" msgstr "嘗試寫入ä¸åœ¨ç´¢å¼•çš„æ交" @@ -22272,7 +22517,7 @@ msgstr "ä½åœ–索引檔案æ壞（標é 錯誤）" #: pack-bitmap.c #, c-format msgid "unsupported version '%d' for bitmap index file" -msgstr "ä½åœ–索引檔案的版本 “%d†ä¸æ”¯æ´" +msgstr "ä½åœ–索引檔案的版本「%dã€ä¸æ”¯æ´" #: pack-bitmap.c msgid "corrupted bitmap index file (too short to fit hash cache)" @@ -22283,6 +22528,19 @@ msgid "corrupted bitmap index file (too short to fit lookup table)" msgstr "ä½åœ–索引檔案æ壞（ä¸å¤ 長，無法置入查詢表）" #: pack-bitmap.c +msgid "" +"corrupted bitmap index file (too short to fit pseudo-merge table header)" +msgstr "ä½åœ–索引檔案æ壞（ä¸å¤ 長，無法置入å½åˆä½µè¡¨æ¨™é ）" + +#: pack-bitmap.c +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)" +msgstr "ä½åœ–索引檔案æ壞（ä¸å¤ 長，無法置入å½åˆä½µè¡¨ï¼‰" + +#: pack-bitmap.c +msgid "corrupted bitmap index file, pseudo-merge table too short" +msgstr "ä½åœ–索引檔案æ壞，å½åˆä½µè¡¨å¤ªçŸ" + +#: pack-bitmap.c #, c-format msgid "duplicate entry in bitmap index: '%s'" msgstr "ä½åœ–索引ä¸æœ‰é‡è¤‡é …目：「%sã€" @@ -22347,7 +22605,7 @@ msgstr "ä½åœ–查詢表æ壞：æ交索引 %u 超出範åœ" #: pack-bitmap.c #, c-format msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\"" -msgstr "ewah ä½åœ–æ壞：æ交 “%s†之ä½åœ–的標é é截斷" +msgstr "ewah ä½åœ–æ壞：æ交「%sã€ä¹‹ä½åœ–的標é é截斷" #: pack-bitmap.c #, c-format @@ -22397,6 +22655,11 @@ msgstr "ä½åœ–çµæžœä¸æœ‰ä¸ç¬¦é …ç›®" #: pack-bitmap.c #, c-format +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)" +msgstr "å½åˆä½µç´¢å¼•è¶…出範åœï¼ˆ%<PRIu32> >= %<PRIuMAX>）" + +#: pack-bitmap.c +#, c-format msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>" msgstr "在「%2$sã€å°åŒ…，ä½ç§» %3$<PRIuMAX> 的地方找ä¸åˆ°ã€Œ%1$sã€" @@ -22408,7 +22671,7 @@ msgstr "無法å–得「%sã€çš„ç£ç¢Ÿç”¨é‡" #: pack-bitmap.c #, c-format msgid "bitmap file '%s' has invalid checksum" -msgstr "“%s†ä½åœ–檔案的總和檢查碼無效" +msgstr "「%sã€ä½åœ–檔案的總和檢查碼無效" #: pack-mtimes.c #, c-format @@ -22751,7 +23014,7 @@ msgstr "%s：'literal' å’Œ 'glob' ä¸ç›¸å®¹" #: pathspec.c #, c-format msgid "'%s' is outside the directory tree" -msgstr "“%s†在目錄樹之外" +msgstr "「%sã€åœ¨ç›®éŒ„樹之外" #: pathspec.c #, c-format @@ -22848,6 +23111,10 @@ msgid "unable to parse --pretty format" msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" #: promisor-remote.c +msgid "lazy fetching disabled; some objects may not be available" +msgstr "延後抓å–已被åœç”¨ï¼›æŸäº›ç‰©ä»¶å¯èƒ½ç„¡æ³•ä½¿ç”¨" + +#: promisor-remote.c msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: 無法 fork fetch å處ç†ç¨‹åº" @@ -22877,6 +23144,72 @@ msgstr "object-info：引數後é 期è¦æœ‰ flush" msgid "Removing duplicate objects" msgstr "æ£åœ¨åˆªé™¤é‡è¤‡ç‰©ä»¶" +#: pseudo-merge.c +#, c-format +msgid "failed to load pseudo-merge regex for %s: '%s'" +msgstr "未能載入 %s çš„å½åˆä½µå¸¸è¦è¡¨ç¤ºå¼ï¼š%s" + +#: pseudo-merge.c +#, c-format +msgid "%s must be non-negative, using default" +msgstr "%s é ˆç‚ºéžè² 數，將採用é è¨å€¼" + +#: pseudo-merge.c +#, c-format +msgid "%s must be between 0 and 1, using default" +msgstr "%s é ˆä»‹æ–¼ 0 到 1 之間，將採用é è¨å€¼" + +#: pseudo-merge.c +#, c-format +msgid "%s must be positive, using default" +msgstr "%s é ˆç‚ºæ£æ•¸ï¼Œå°‡æŽ¡ç”¨é è¨å€¼" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' missing required pattern" +msgstr "å½åˆä½µç¾¤çµ„「%sã€ç¼ºå°‘å¿…é ˆçš„æ¨¡å¼" + +#: pseudo-merge.c +#, c-format +msgid "pseudo-merge group '%s' has unstable threshold before stable one" +msgstr "å½åˆä½µç¾¤çµ„「%sã€çš„éžç©©å®šé–¾å€¼ä½æ–¼ç©©å®šè€…之å‰" + +#: pseudo-merge.c +#, c-format +msgid "" +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)" +msgstr "來自組態的å½åˆä½µå¸¸è¦è¡¨ç¤ºå¼åŒ…å«å¤ªå¤šçš„æ“·å–群組（最多 %<PRIuMAX> 個）" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "延伸å½åˆä½µè®€å–超出範åœï¼ˆ%<PRIuMAX> >= %<PRIuMAX>）" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "延伸å½åˆä½µé …ç›®éŽçŸï¼ˆ%<PRIuMAX> >= %<PRIuMAX>）" + +#: pseudo-merge.c +#, c-format +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>" +msgstr "無法在å移 %2$<PRIuMAX> 處找到æ交 %1$s çš„å½åˆä½µ" + +#: pseudo-merge.c +#, c-format +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)" +msgstr "延伸å½åˆä½µæŸ¥è©¢è¶…出範åœï¼ˆ%<PRIu32> >= %<PRIu32>）" + +#: pseudo-merge.c +#, c-format +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)" +msgstr "讀å–超出範åœï¼šï¼ˆ%<PRIuMAX> >= %<PRIuMAX>）" + +#: pseudo-merge.c +#, c-format +msgid "could not read extended pseudo-merge table for commit %s" +msgstr "無法讀å–æ交 %s 的延伸å½åˆä½µè¡¨" + #: range-diff.c msgid "could not start `log`" msgstr "ä¸èƒ½å•Ÿå‹• `log`" @@ -22914,7 +23247,7 @@ msgstr "ä¸èƒ½è§£æž '%s' 的日誌" #: reachable.c #, c-format msgid "invalid extra cruft tip: '%s'" -msgstr "無效的é¡å¤–廢棄æ交修訂版：“%sâ€" +msgstr "無效的é¡å¤–廢棄æ交修訂版：「%sã€" #: reachable.c msgid "unable to enumerate additional recent objects" @@ -23106,7 +23439,7 @@ msgstr "éžé 期的 diff 狀態 %c" #: read-cache.c #, c-format msgid "remove '%s'\n" -msgstr "移除 “%sâ€\n" +msgstr "移除「%sã€\n" #: rebase-interactive.c msgid "" @@ -23156,11 +23489,11 @@ msgstr "" "r, reword <æ交> = 使用æ交，但編輯æ交說明\n" "e, edit <æ交> = 使用æ交，但ä¸ç›´æŽ¥ä¿®è£œ (amend) \n" "s, squash <æ交> = 使用æ交，但èžåˆè‡³ä¸Šå€‹æ交\n" -"f, fixup [-C | -c] <æ交> = è·Ÿ “squash†相似，但除éžå‚³å…¥ -C，\n" +"f, fixup [-C | -c] <æ交> = 跟「squashã€ç›¸ä¼¼ï¼Œä½†é™¤éžå‚³å…¥ -C，\n" " å¦å‰‡åªä¿ç•™ä¸Šä¸€å€‹æ交的日誌訊æ¯ã€‚傳入 -C 表示åªä¿ç•™é€™å€‹\n" " æ交的訊æ¯ï¼›å‚³å…¥ -c 與 -C 功能相åŒï¼Œä½†æœƒé–‹å•Ÿç·¨è¼¯å™¨\n" "x, exec <命令> = 使用 shell 執行命令（這一列的剩餘部分）\n" -"b, break = 在æ¤åœæ¢ï¼ˆä½¿ç”¨ “git rebase --continue†繼續é‡å®šåŸºåº•ï¼‰\n" +"b, break = 在æ¤åœæ¢ï¼ˆä½¿ç”¨ã€Œgit rebase --continueã€ç¹¼çºŒé‡å®šåŸºåº•ï¼‰\n" "d, drop <æ交> = 移除æ交\n" "l, label <標籤> = ç‚ºç›®å‰ HEAD 打上指定åå—標籤\n" "t, reset <標籤> = é‡è¨ HEAD 到指定標籤\n" @@ -23432,7 +23765,7 @@ msgstr "--format=%.*s ä¸èƒ½å’Œ --pythonã€--shellã€--tcl 一起使用" #: ref-filter.c msgid "failed to run 'describe'" -msgstr "無法執行 “describeâ€" +msgstr "無法執行「describeã€" #: ref-filter.c #, c-format @@ -23550,8 +23883,8 @@ msgstr "" "\n" "\tgit config --global init.defaultBranch <name>\n" "\n" -"除了 “master†外，常用的分支å稱有 “mainâ€, “trunk†以åŠ\n" -"“developmentâ€ã€‚剛建立的分支å¯ä»¥ç”¨é€™å€‹å‘½ä»¤é‡æ–°å‘½å：\n" +"除了「masterã€å¤–，常用的分支å稱有「mainã€,「trunkã€ä»¥åŠ\n" +"「developmentã€ã€‚剛建立的分支å¯ä»¥ç”¨é€™å€‹å‘½ä»¤é‡æ–°å‘½å：\n" "\n" "\tgit branch -m <name>\n" @@ -23586,12 +23919,21 @@ msgid "log for %s is empty" msgstr "%s 的日誌為空" #: refs.c +msgid "refusing to force and skip creation of reflog" +msgstr "拒絕強制並略éŽå»ºç«‹å¼•ç”¨æ—¥èªŒ" + +#: refs.c #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒絕更新有錯誤å稱 '%s' 的引用" #: refs.c #, c-format +msgid "refusing to update pseudoref '%s'" +msgstr "拒絕更新å½å¼•ç”¨ã€Œ%sã€" + +#: refs.c +#, c-format msgid "update_ref failed for ref '%s': %s" msgstr "å°å¼•ç”¨ '%s' 執行 update_ref 失敗：%s" @@ -23628,6 +23970,27 @@ msgstr "無法刪除引用 %s：%s" msgid "could not delete references: %s" msgstr "無法刪除引用：%s" +#: refs.c +#, c-format +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n" +msgstr "完æˆå¼•ç”¨ç§»è½‰çš„測試執行，å¯ä»¥åœ¨ã€Œ%sã€æ‰¾åˆ°çµæžœ\n" + +#: refs.c +#, c-format +msgid "could not remove temporary migration directory '%s'" +msgstr "無法移除暫時性é·ç§»ç›®éŒ„「%sã€" + +#: refs.c +#, c-format +msgid "migrated refs can be found at '%s'" +msgstr "å¯ä»¥åœ¨ã€Œ%sã€æ‰¾åˆ°å·²é·ç§»çš„引用" + +#: refs/files-backend.c refs/reftable-backend.c +#, c-format +msgid "" +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref" +msgstr "無法鎖定引用「%sã€ï¼šé 期是指å‘「%sã€çš„符號引用，但這個是一般引用" + #: refs/reftable-backend.c #, c-format msgid "refname is dangerous: %s" @@ -23839,7 +24202,7 @@ msgstr "å”定錯誤：é 期是「<URL> <路徑>ã€ï¼Œä½†ç¼ºå°‘空白" #: remote-curl.c #, c-format msgid "failed to download file at URL '%s'" -msgstr "無法下載ä½æ–¼ URL “%s†的檔案" +msgstr "無法下載ä½æ–¼ URL「%sã€çš„檔案" #: remote-curl.c msgid "git-http-push failed" @@ -23878,12 +24241,12 @@ msgstr "æ供了一個以上的 uploadpack，使用第一個" #: remote.c #, c-format msgid "unrecognized value transfer.credentialsInUrl: '%s'" -msgstr "數值 transfer.credentialsInUrl 無法è˜åˆ¥ï¼šâ€œ%sâ€" +msgstr "數值 transfer.credentialsInUrl 無法è˜åˆ¥ï¼šã€Œ%sã€" #: remote.c #, c-format msgid "URL '%s' uses plaintext credentials" -msgstr "URL “%s†使用明文憑è‰" +msgstr "URL「%sã€ä½¿ç”¨æ˜Žæ–‡æ†‘è‰" #: remote.c #, c-format @@ -24124,7 +24487,7 @@ msgstr[0] "" #: remote.c msgid "" " (use \"git pull\" if you want to integrate the remote branch with yours)\n" -msgstr " （使用 “git pull†來將é 端分支整åˆé€²æ‚¨çš„分支）\n" +msgstr " （使用「git pullã€ä¾†å°‡é 端分支整åˆé€²æ‚¨çš„分支）\n" #: remote.c #, c-format @@ -24197,7 +24560,7 @@ msgstr "使用之å‰çš„解決方案解決 '%s'。" #: rerere.c #, c-format msgid "cannot unlink stray '%s'" -msgstr "無法刪除失散檔案 “%sâ€" +msgstr "無法刪除失散檔案「%sã€" #: rerere.c #, c-format @@ -24280,7 +24643,7 @@ msgstr "--unpacked=<packfile> å·²ä¸å—支æ´" #: revision.c #, c-format msgid "invalid option '%s' in --stdin mode" -msgstr "在 --stdin 模å¼ä¸‹ï¼Œâ€œ%s†é¸é …無效" +msgstr "在 --stdin 模å¼ä¸‹ï¼Œã€Œ%sã€é¸é …無效" #: revision.c msgid "your current branch appears to be broken" @@ -24394,7 +24757,7 @@ msgstr "åªä¸‹è¼‰æœƒç°½å‡ºçš„分支ä¸ä»‹è³‡æ–™" #: scalar.c msgid "create repository within 'src' directory" -msgstr "在 “src†目錄建立版本庫" +msgstr "在「srcã€ç›®éŒ„建立版本庫" #: scalar.c msgid "" @@ -24464,27 +24827,27 @@ msgstr "--all 或 <enlistment> 但ä¸èƒ½å‚³å…¥å…©è€…" #: scalar.c #, c-format msgid "could not remove stale scalar.repo '%s'" -msgstr "無法移除éŽæ™‚çš„ scalar.repo “%sâ€" +msgstr "無法移除éŽæ™‚çš„ scalar.repo「%sã€" #: scalar.c #, c-format msgid "removed stale scalar.repo '%s'" -msgstr "已移除éŽæ™‚çš„ scalar.repo “%sâ€" +msgstr "已移除éŽæ™‚çš„ scalar.repo「%sã€" #: scalar.c #, c-format msgid "repository at '%s' has different owner" -msgstr "ä½æ–¼ “%s†的版本庫有ä¸åŒçš„æ“有者" +msgstr "ä½æ–¼ã€Œ%sã€çš„版本庫有ä¸åŒçš„æ“有者" #: scalar.c #, c-format msgid "repository at '%s' has a format issue" -msgstr "ä½æ–¼ “%sâ€ çš„ç‰ˆæœ¬åº«æœ‰æ ¼å¼å•é¡Œ" +msgstr "ä½æ–¼ã€Œ%sã€çš„ç‰ˆæœ¬åº«æœ‰æ ¼å¼å•é¡Œ" #: scalar.c #, c-format msgid "repository not found in '%s'" -msgstr "版本庫ä¸åœ¨ “%sâ€" +msgstr "版本庫ä¸åœ¨ã€Œ%sã€" #: scalar.c #, c-format @@ -25008,12 +25371,12 @@ msgstr "git %s：無法é‡æ–°æ•´ç†ç´¢å¼•" #: sequencer.c #, c-format msgid "'%s' is not a valid label" -msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„標籤" +msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆçš„標籤" #: sequencer.c #, c-format msgid "'%s' is not a valid refname" -msgstr "“%s†ä¸æ˜¯æœ‰æ•ˆçš„引用å稱" +msgstr "「%sã€ä¸æ˜¯æœ‰æ•ˆçš„引用å稱" #: sequencer.c #, c-format @@ -25022,8 +25385,56 @@ msgstr "update-ref 需è¦å®Œå…¨é™å®šçš„引用å稱，比如：refs/heads/%s" #: sequencer.c #, c-format +msgid "'%s' does not accept merge commits" +msgstr "「%sã€ä¸æŽ¥å—åˆä½µæ交" + +#. TRANSLATORS: 'pick' and 'merge -C' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'pick' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit." +msgstr "" +"ä¸èƒ½ä½¿ç”¨ã€Œpickã€é¸æ“‡ä¸€å€‹åˆä½µæ交。\n" +"å¦‚æžœä½ æƒ³è¦é‡æ”¾é€™å€‹åˆä½µï¼Œè«‹å°é€™å€‹æ交使用「merge -Cã€ã€‚" + +#. TRANSLATORS: 'reword' and 'merge -c' should not be +#. translated. +#. +#: sequencer.c +msgid "" +"'reword' does not take a merge commit. If you wanted to\n" +"replay the merge and reword the commit message, use\n" +"'merge -c' on the commit" +msgstr "" +"「rewordã€ä¸¦ç„¡æ³•ä½¿ç”¨åˆä½µæ交作為åƒæ•¸ã€‚\n" +"å¦‚æžœä½ å¸Œæœ›åˆä½µä¸¦æ”¹å¯«æ交訊æ¯ï¼Œ\n" +"è«‹å°é€™å€‹æ交使用「merge -cã€" + +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should +#. not be translated. +#. +#: sequencer.c +msgid "" +"'edit' does not take a merge commit. If you wanted to\n" +"replay the merge, use 'merge -C' on the commit, and then\n" +"'break' to give the control back to you so that you can\n" +"do 'git commit --amend && git rebase --continue'." +msgstr "" +"「editã€ä¸¦ç„¡æ³•ä½¿ç”¨åˆä½µæ交作為åƒæ•¸ã€‚\n" +"å¦‚æžœä½ å¸Œæœ›é‡æ”¾é€™å€‹åˆä½µï¼Œè«‹å°é€™å€‹æ交使用「merge -Cã€ï¼Œ\n" +"並使用「breakã€å–回控制權，\n" +"這樣æ‰èƒ½åŸ·è¡Œã€Œgit commit --amend && git rebase --continueã€ã€‚" + +#: sequencer.c +msgid "cannot squash merge commit into another commit" +msgstr "無法將一個åˆä½µæ交壓æ‰é€²å…¶ä»–æ交" + +#: sequencer.c +#, c-format msgid "invalid command '%.*s'" -msgstr "無效的命令 “%.*sâ€" +msgstr "無效的命令「%.*sã€" #: sequencer.c #, c-format @@ -25170,9 +25581,8 @@ msgid "cannot read HEAD" msgstr "ä¸èƒ½è®€å– HEAD" #: sequencer.c -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "無法複製 '%s' 至 '%s'" +msgid "could not write commit message file" +msgstr "無法寫入æ交訊æ¯æª”案" #: sequencer.c #, c-format @@ -25299,7 +25709,7 @@ msgstr "åˆä½µï¼šç„¡æ³•å¯«å…¥æ–°ç´¢å¼•æª”案" #, c-format msgid "" "another 'rebase' process appears to be running; '%s.lock' already exists" -msgstr "似乎有å¦ä¸€å€‹ “rebase†程åºæ£åœ¨é€²è¡Œï¼›â€œ%s.lock†已經å˜åœ¨" +msgstr "似乎有å¦ä¸€å€‹ã€Œrebaseã€ç¨‹åºæ£åœ¨é€²è¡Œï¼›ã€Œ%s.lockã€å·²ç¶“å˜åœ¨" #: sequencer.c #, c-format @@ -25650,6 +26060,19 @@ msgid "failed to stat '%*s%s%s'" msgstr "å–å¾— '%*s%s%s' 狀態（stat）失敗" #: setup.c +#, c-format +msgid "" +"detected dubious ownership in repository at '%s'\n" +"%sTo add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"在ä½æ–¼ã€Œ%sã€çš„版本庫åµæ¸¬åˆ°å¯ç–‘所有權\n" +"%sè‹¥è¦æ”¾è¡Œæœ¬ç›®éŒ„，請呼å«ï¼š\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#: setup.c msgid "Unable to read current working directory" msgstr "ä¸èƒ½è®€å–ç›®å‰å·¥ä½œç›®éŒ„" @@ -25674,21 +26097,8 @@ msgstr "" #: setup.c #, c-format -msgid "" -"detected dubious ownership in repository at '%s'\n" -"%sTo add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"在ä½æ–¼ã€Œ%sã€çš„版本庫åµæ¸¬åˆ°å¯ç–‘所有權\n" -"%sè‹¥è¦æ”¾è¡Œæœ¬ç›®éŒ„，請呼å«ï¼š\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#: setup.c -#, c-format msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')" -msgstr "無法使用 “%s†純版本庫（safe.bareRepository 是 “%sâ€ï¼‰" +msgstr "無法使用「%sã€ç´”版本庫（safe.bareRepository 是「%sã€ï¼‰" #: setup.c #, c-format @@ -26049,6 +26459,16 @@ msgstr "「%sã€å模組 git 目錄在「%.*sã€git 路徑ä¸" #: submodule.c #, c-format +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link" +msgstr "é 期「%.*sã€ï¼ˆä½æ–¼å模組路徑「%sã€ï¼‰ä¸æ˜¯è±¡å¾µå¼é€£çµ" + +#: submodule.c +#, c-format +msgid "expected submodule path '%s' not to be a symbolic link" +msgstr "é 期å模組路徑「%sã€ä¸æ˜¯è±¡å¾µå¼é€£çµ" + +#: submodule.c +#, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "ä¸æ”¯æ´å°æœ‰å¤šå€‹å·¥ä½œå€çš„å模組 '%s' 執行 relocate_gitdir" @@ -26086,18 +26506,13 @@ msgstr "ls-tree 返回未知返回值 %d" #: symlinks.c #, c-format msgid "failed to lstat '%s'" -msgstr "無法 lstat “%sâ€" +msgstr "無法 lstat「%sã€" #: t/helper/test-bundle-uri.c msgid "no remote configured to get bundle URIs from" msgstr "沒有è¨å®šå¯ä»¥ç”¨ä¾†å–得套件包 URIs çš„é 端" #: t/helper/test-bundle-uri.c -#, c-format -msgid "remote '%s' has no configured URL" -msgstr "“%s†é 端未è¨å®š URL" - -#: t/helper/test-bundle-uri.c msgid "could not get the bundle-uri list" msgstr "無法å–å¾— bundle-uri 清單" @@ -27439,7 +27854,7 @@ msgstr "列舉未追蹤檔案花費 %.2f 秒。" #: wt-status.c msgid "See 'git help status' for information on how to improve this." -msgstr "è«‹åƒé–± “git help status†深入了解如何改善。" +msgstr "è«‹åƒé–±ã€Œgit help statusã€æ·±å…¥äº†è§£å¦‚何改善。" #: wt-status.c #, c-format @@ -27885,29 +28300,29 @@ msgstr "ç„¡æ³•å‚³é€ %s\n" #: git-send-email.perl #, perl-format -msgid "Dry-Sent %s\n" -msgstr "æ¸¬è©¦åŸ·è¡Œå‚³é€ %s\n" +msgid "Dry-Sent %s" +msgstr "è©¦åŸ·è¡Œå‚³é€ %s" #: git-send-email.perl #, perl-format -msgid "Sent %s\n" -msgstr "æ£å‚³é€ %s\n" +msgid "Sent %s" +msgstr "æ£å‚³é€ %s" #: git-send-email.perl -msgid "Dry-OK. Log says:\n" -msgstr "測試執行æˆåŠŸã€‚日誌說：\n" +msgid "Dry-OK. Log says:" +msgstr "試執行æˆåŠŸã€‚日誌說：" #: git-send-email.perl -msgid "OK. Log says:\n" -msgstr "OK。日誌說：\n" +msgid "OK. Log says:" +msgstr "OK。日誌說：" #: git-send-email.perl msgid "Result: " msgstr "çµæžœï¼š " #: git-send-email.perl -msgid "Result: OK\n" -msgstr "çµæžœï¼šOK\n" +msgid "Result: OK" +msgstr "çµæžœï¼šOK" #: git-send-email.perl #, perl-format @@ -27942,7 +28357,7 @@ msgstr "(%s) ä¸èƒ½åŸ·è¡Œ '%s'" #: git-send-email.perl #, perl-format msgid "(%s) Malformed output from '%s'" -msgstr "(%s) 從 “%sâ€ è®€åˆ°æ ¼å¼éŒ¯èª¤çš„輸出" +msgstr "(%s) 從「%sã€è®€åˆ°æ ¼å¼éŒ¯èª¤çš„輸出" #: git-send-email.perl #, perl-format @@ -27998,6 +28413,34 @@ msgstr "ç•¥éŽ %s å«å‚™ä»½å¾Œç¶´ '%s'。\n" msgid "Do you really want to send %s? [y|N]: " msgstr "您真的è¦å‚³é€ %s？[y|N]： " +#~ msgid "" +#~ "the add.interactive.useBuiltin setting has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "add.interactive.useBuiltin è¨å®šå·²è¢«ç§»é™¤ï¼\n" +#~ "深入了解請åƒé–± “git help config†ä¸çš„å°æ‡‰æ¢ç›®ã€‚" + +#~ msgid "git archive: Remote with no URL" +#~ msgstr "git archive: 未æä¾›é 端 URL" + +#~ msgid "only one action at a time" +#~ msgstr "一次åªèƒ½æœ‰ä¸€å€‹å‹•ä½œ" + +#~ msgid "use [RFC PATCH] instead of [PATCH]" +#~ msgstr "使用 [RFC PATCH] 代替 [PATCH]" + +#, c-format +#~ msgid "no URLs configured for remote '%s'" +#~ msgstr "沒有給é 端版本庫 '%s' è¨å®š URL" + +#, c-format +#~ msgid "unable to copy '%s' to '%s'" +#~ msgstr "無法複製 '%s' 至 '%s'" + +#, c-format +#~ msgid "remote '%s' has no configured URL" +#~ msgstr "“%s†é 端未è¨å®š URL" + #, c-format #~ msgid "truncating .rej filename to %.*s.rej" #~ msgstr "æ£åœ¨å°‡ .rej 檔案å稱截çŸç‚º %.*s.rej" @@ -28045,9 +28488,6 @@ msgstr "您真的è¦å‚³é€ %s？[y|N]： " #~ msgid "core.commentChar should only be one ASCII character" #~ msgstr "core.commentChar 應該是一個 ASCII å—å…ƒ" -#~ msgid "-x and -X cannot be used together" -#~ msgstr "-x å’Œ -X ä¸èƒ½åŒæ™‚使用" - #~ msgid "" #~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" #~ "exclude" @@ -2844,6 +2844,14 @@ int repo_migrate_ref_storage_format(struct repository *repo, } /* + * Release the new ref store such that any potentially-open files will + * be closed. This is required for platforms like Cygwin, where + * renaming an open file results in EPERM. + */ + ref_store_release(new_refs); + FREE_AND_NULL(new_refs); + + /* * Until now we were in the non-destructive phase, where we only * populated the new ref store. From hereon though we are about * to get hands by deleting the old ref store and then moving @@ -2874,10 +2882,14 @@ int repo_migrate_ref_storage_format(struct repository *repo, */ initialize_repository_version(hash_algo_by_ptr(repo->hash_algo), format, 1); - free(new_refs->gitdir); - new_refs->gitdir = xstrdup(old_refs->gitdir); - repo->refs_private = new_refs; + /* + * Unset the old ref store and release it. `get_main_ref_store()` will + * make sure to lazily re-initialize the repository's ref store with + * the new format. + */ ref_store_release(old_refs); + FREE_AND_NULL(old_refs); + repo->refs_private = NULL; ret = 0; @@ -2888,8 +2900,10 @@ done: new_gitdir.buf); } - if (ret && new_refs) + if (new_refs) { ref_store_release(new_refs); + free(new_refs); + } ref_transaction_free(transaction); strbuf_release(&new_gitdir); return ret; @@ -1087,10 +1087,10 @@ int repo_migrate_ref_storage_format(struct repository *repo, struct strbuf *err); /* - * The following functions have been removed in Git v2.45 in favor of functions + * The following functions have been removed in Git v2.46 in favor of functions * that receive a `ref_store` as parameter. The intent of this section is * merely to help patch authors of in-flight series to have a reference what - * they should be migrating to. The section will be removed in Git v2.46. + * they should be migrating to. The section will be removed in Git v2.47. */ #if 0 static char *resolve_refdup(const char *refname, int resolve_flags, diff --git a/reftable/record_test.c b/reftable/record_test.c deleted file mode 100644 index 58290bdba3..0000000000 --- a/reftable/record_test.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - Copyright 2020 Google LLC - - Use of this source code is governed by a BSD-style - license that can be found in the LICENSE file or at - https://developers.google.com/open-source/licenses/bsd -*/ - -#include "record.h" - -#include "system.h" -#include "basics.h" -#include "constants.h" -#include "test_framework.h" -#include "reftable-tests.h" - -static void test_copy(struct reftable_record *rec) -{ - struct reftable_record copy; - uint8_t typ; - - typ = reftable_record_type(rec); - reftable_record_init(©, typ); - reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ); - /* do it twice to catch memory leaks */ - reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ); - EXPECT(reftable_record_equal(rec, ©, GIT_SHA1_RAWSZ)); - - puts("testing print coverage:\n"); - reftable_record_print(©, GIT_SHA1_RAWSZ); - - reftable_record_release(©); -} - -static void test_varint_roundtrip(void) -{ - uint64_t inputs[] = { 0, - 1, - 27, - 127, - 128, - 257, - 4096, - ((uint64_t)1 << 63), - ((uint64_t)1 << 63) + ((uint64_t)1 << 63) - 1 }; - int i = 0; - for (i = 0; i < ARRAY_SIZE(inputs); i++) { - uint8_t dest[10]; - - struct string_view out = { - .buf = dest, - .len = sizeof(dest), - }; - uint64_t in = inputs[i]; - int n = put_var_int(&out, in); - uint64_t got = 0; - - EXPECT(n > 0); - out.len = n; - n = get_var_int(&got, &out); - EXPECT(n > 0); - - EXPECT(got == in); - } -} - -static void set_hash(uint8_t *h, int j) -{ - int i = 0; - for (i = 0; i < hash_size(GIT_SHA1_FORMAT_ID); i++) { - h[i] = (j >> i) & 0xff; - } -} - -static void test_reftable_ref_record_roundtrip(void) -{ - struct strbuf scratch = STRBUF_INIT; - int i = 0; - - for (i = REFTABLE_REF_DELETION; i < REFTABLE_NR_REF_VALUETYPES; i++) { - struct reftable_record in = { - .type = BLOCK_TYPE_REF, - }; - struct reftable_record out = { .type = BLOCK_TYPE_REF }; - struct strbuf key = STRBUF_INIT; - uint8_t buffer[1024] = { 0 }; - struct string_view dest = { - .buf = buffer, - .len = sizeof(buffer), - }; - int n, m; - - in.u.ref.value_type = i; - switch (i) { - case REFTABLE_REF_DELETION: - break; - case REFTABLE_REF_VAL1: - set_hash(in.u.ref.value.val1, 1); - break; - case REFTABLE_REF_VAL2: - set_hash(in.u.ref.value.val2.value, 1); - set_hash(in.u.ref.value.val2.target_value, 2); - break; - case REFTABLE_REF_SYMREF: - in.u.ref.value.symref = xstrdup("target"); - break; - } - in.u.ref.refname = xstrdup("refs/heads/master"); - - test_copy(&in); - - EXPECT(reftable_record_val_type(&in) == i); - - reftable_record_key(&in, &key); - n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); - EXPECT(n > 0); - - /* decode into a non-zero reftable_record to test for leaks. */ - m = reftable_record_decode(&out, key, i, dest, GIT_SHA1_RAWSZ, &scratch); - EXPECT(n == m); - - EXPECT(reftable_ref_record_equal(&in.u.ref, &out.u.ref, - GIT_SHA1_RAWSZ)); - reftable_record_release(&in); - - strbuf_release(&key); - reftable_record_release(&out); - } - - strbuf_release(&scratch); -} - -static void test_reftable_log_record_equal(void) -{ - struct reftable_log_record in[2] = { - { - .refname = xstrdup("refs/heads/master"), - .update_index = 42, - }, - { - .refname = xstrdup("refs/heads/master"), - .update_index = 22, - } - }; - - EXPECT(!reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); - in[1].update_index = in[0].update_index; - EXPECT(reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); - reftable_log_record_release(&in[0]); - reftable_log_record_release(&in[1]); -} - -static void test_reftable_log_record_roundtrip(void) -{ - int i; - struct reftable_log_record in[] = { - { - .refname = xstrdup("refs/heads/master"), - .update_index = 42, - .value_type = REFTABLE_LOG_UPDATE, - .value = { - .update = { - .name = xstrdup("han-wen"), - .email = xstrdup("hanwen@google.com"), - .message = xstrdup("test"), - .time = 1577123507, - .tz_offset = 100, - }, - } - }, - { - .refname = xstrdup("refs/heads/master"), - .update_index = 22, - .value_type = REFTABLE_LOG_DELETION, - }, - { - .refname = xstrdup("branch"), - .update_index = 33, - .value_type = REFTABLE_LOG_UPDATE, - } - }; - struct strbuf scratch = STRBUF_INIT; - - set_test_hash(in[0].value.update.new_hash, 1); - set_test_hash(in[0].value.update.old_hash, 2); - set_test_hash(in[2].value.update.new_hash, 3); - set_test_hash(in[2].value.update.old_hash, 4); - for (i = 0; i < ARRAY_SIZE(in); i++) { - struct reftable_record rec = { .type = BLOCK_TYPE_LOG }; - struct strbuf key = STRBUF_INIT; - uint8_t buffer[1024] = { 0 }; - struct string_view dest = { - .buf = buffer, - .len = sizeof(buffer), - }; - /* populate out, to check for leaks. */ - struct reftable_record out = { - .type = BLOCK_TYPE_LOG, - .u.log = { - .refname = xstrdup("old name"), - .value_type = REFTABLE_LOG_UPDATE, - .value = { - .update = { - .name = xstrdup("old name"), - .email = xstrdup("old@email"), - .message = xstrdup("old message"), - }, - }, - }, - }; - int n, m, valtype; - - rec.u.log = in[i]; - - test_copy(&rec); - - reftable_record_key(&rec, &key); - - n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ); - EXPECT(n >= 0); - valtype = reftable_record_val_type(&rec); - m = reftable_record_decode(&out, key, valtype, dest, - GIT_SHA1_RAWSZ, &scratch); - EXPECT(n == m); - - EXPECT(reftable_log_record_equal(&in[i], &out.u.log, - GIT_SHA1_RAWSZ)); - reftable_log_record_release(&in[i]); - strbuf_release(&key); - reftable_record_release(&out); - } - - strbuf_release(&scratch); -} - -static void test_key_roundtrip(void) -{ - uint8_t buffer[1024] = { 0 }; - struct string_view dest = { - .buf = buffer, - .len = sizeof(buffer), - }; - struct strbuf last_key = STRBUF_INIT; - struct strbuf key = STRBUF_INIT; - struct strbuf roundtrip = STRBUF_INIT; - int restart; - uint8_t extra; - int n, m; - uint8_t rt_extra; - - strbuf_addstr(&last_key, "refs/heads/master"); - strbuf_addstr(&key, "refs/tags/bla"); - extra = 6; - n = reftable_encode_key(&restart, dest, last_key, key, extra); - EXPECT(!restart); - EXPECT(n > 0); - - strbuf_addstr(&roundtrip, "refs/heads/master"); - m = reftable_decode_key(&roundtrip, &rt_extra, dest); - EXPECT(n == m); - EXPECT(0 == strbuf_cmp(&key, &roundtrip)); - EXPECT(rt_extra == extra); - - strbuf_release(&last_key); - strbuf_release(&key); - strbuf_release(&roundtrip); -} - -static void test_reftable_obj_record_roundtrip(void) -{ - uint8_t testHash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 4, 0 }; - uint64_t till9[] = { 1, 2, 3, 4, 500, 600, 700, 800, 9000 }; - struct reftable_obj_record recs[3] = { - { - .hash_prefix = testHash1, - .hash_prefix_len = 5, - .offsets = till9, - .offset_len = 3, - }, - { - .hash_prefix = testHash1, - .hash_prefix_len = 5, - .offsets = till9, - .offset_len = 9, - }, - { - .hash_prefix = testHash1, - .hash_prefix_len = 5, - }, - }; - struct strbuf scratch = STRBUF_INIT; - int i = 0; - - for (i = 0; i < ARRAY_SIZE(recs); i++) { - uint8_t buffer[1024] = { 0 }; - struct string_view dest = { - .buf = buffer, - .len = sizeof(buffer), - }; - struct reftable_record in = { - .type = BLOCK_TYPE_OBJ, - .u = { - .obj = recs[i], - }, - }; - struct strbuf key = STRBUF_INIT; - struct reftable_record out = { .type = BLOCK_TYPE_OBJ }; - int n, m; - uint8_t extra; - - test_copy(&in); - reftable_record_key(&in, &key); - n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); - EXPECT(n > 0); - extra = reftable_record_val_type(&in); - m = reftable_record_decode(&out, key, extra, dest, - GIT_SHA1_RAWSZ, &scratch); - EXPECT(n == m); - - EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ)); - strbuf_release(&key); - reftable_record_release(&out); - } - - strbuf_release(&scratch); -} - -static void test_reftable_index_record_roundtrip(void) -{ - struct reftable_record in = { - .type = BLOCK_TYPE_INDEX, - .u.idx = { - .offset = 42, - .last_key = STRBUF_INIT, - }, - }; - uint8_t buffer[1024] = { 0 }; - struct string_view dest = { - .buf = buffer, - .len = sizeof(buffer), - }; - struct strbuf scratch = STRBUF_INIT; - struct strbuf key = STRBUF_INIT; - struct reftable_record out = { - .type = BLOCK_TYPE_INDEX, - .u.idx = { .last_key = STRBUF_INIT }, - }; - int n, m; - uint8_t extra; - - strbuf_addstr(&in.u.idx.last_key, "refs/heads/master"); - reftable_record_key(&in, &key); - test_copy(&in); - - EXPECT(0 == strbuf_cmp(&key, &in.u.idx.last_key)); - n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); - EXPECT(n > 0); - - extra = reftable_record_val_type(&in); - m = reftable_record_decode(&out, key, extra, dest, GIT_SHA1_RAWSZ, - &scratch); - EXPECT(m == n); - - EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ)); - - reftable_record_release(&out); - strbuf_release(&key); - strbuf_release(&scratch); - strbuf_release(&in.u.idx.last_key); -} - -int record_test_main(int argc, const char *argv[]) -{ - RUN_TEST(test_reftable_log_record_equal); - RUN_TEST(test_reftable_log_record_roundtrip); - RUN_TEST(test_reftable_ref_record_roundtrip); - RUN_TEST(test_varint_roundtrip); - RUN_TEST(test_key_roundtrip); - RUN_TEST(test_reftable_obj_record_roundtrip); - RUN_TEST(test_reftable_index_record_roundtrip); - return 0; -} diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h index 114cc3d053..d5e03dcc1b 100644 --- a/reftable/reftable-tests.h +++ b/reftable/reftable-tests.h @@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd int basics_test_main(int argc, const char **argv); int block_test_main(int argc, const char **argv); -int merged_test_main(int argc, const char **argv); int pq_test_main(int argc, const char **argv); int record_test_main(int argc, const char **argv); int readwrite_test_main(int argc, const char **argv); diff --git a/run-command.c b/run-command.c index d9f80fabe6..45ba544932 100644 --- a/run-command.c +++ b/run-command.c @@ -274,17 +274,24 @@ int sane_execvp(const char *file, char * const argv[]) return -1; } +char *git_shell_path(void) +{ +#ifndef GIT_WINDOWS_NATIVE + return xstrdup(SHELL_PATH); +#else + char *p = locate_in_PATH("sh"); + convert_slashes(p); + return p; +#endif +} + static const char **prepare_shell_cmd(struct strvec *out, const char **argv) { if (!argv[0]) BUG("shell command is empty"); if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) { -#ifndef GIT_WINDOWS_NATIVE - strvec_push(out, SHELL_PATH); -#else - strvec_push(out, "sh"); -#endif + strvec_push_nodup(out, git_shell_path()); strvec_push(out, "-c"); /* diff --git a/run-command.h b/run-command.h index 55f6631a2a..03e7222d8b 100644 --- a/run-command.h +++ b/run-command.h @@ -196,6 +196,11 @@ int is_executable(const char *name); int exists_in_PATH(const char *command); /** + * Return the path that is used to execute Unix shell command-lines. + */ +char *git_shell_path(void); + +/** * Start a sub-process. Takes a pointer to a `struct child_process` * that specifies the details and returns pipe FDs (if requested). * See below for details. diff --git a/send-pack.c b/send-pack.c index 713da582d7..fa2f5eec17 100644 --- a/send-pack.c +++ b/send-pack.c @@ -427,17 +427,26 @@ static void get_commons_through_negotiation(const char *url, struct child_process child = CHILD_PROCESS_INIT; const struct ref *ref; int len = the_hash_algo->hexsz + 1; /* hash + NL */ + int nr_negotiation_tip = 0; child.git_cmd = 1; child.no_stdin = 1; child.out = -1; strvec_pushl(&child.args, "fetch", "--negotiate-only", NULL); for (ref = remote_refs; ref; ref = ref->next) { - if (!is_null_oid(&ref->new_oid)) - strvec_pushf(&child.args, "--negotiation-tip=%s", oid_to_hex(&ref->new_oid)); + if (!is_null_oid(&ref->new_oid)) { + strvec_pushf(&child.args, "--negotiation-tip=%s", + oid_to_hex(&ref->new_oid)); + nr_negotiation_tip++; + } } strvec_push(&child.args, url); + if (!nr_negotiation_tip) { + child_process_clear(&child); + return; + } + if (start_command(&child)) die(_("send-pack: unable to fork off fetch subprocess")); diff --git a/sequencer.c b/sequencer.c index a2284ac9e9..0291920f0b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -762,7 +762,7 @@ static int do_recursive_merge(struct repository *r, repo_read_index(r); - init_merge_options(&o, r); + init_ui_merge_options(&o, r); o.ancestor = base ? base_label : "(empty tree)"; o.branch1 = "HEAD"; o.branch2 = next ? next_label : "(empty tree)"; @@ -4309,7 +4309,7 @@ static int do_merge(struct repository *r, bases = reverse_commit_list(bases); repo_read_index(r); - init_merge_options(&o, r); + init_ui_merge_options(&o, r); o.branch1 = "HEAD"; o.branch2 = ref_name.buf; o.buffer_output = 2; diff --git a/sparse-index.c b/sparse-index.c index 9913a6078c..9958656ded 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -12,6 +12,22 @@ #include "config.h" #include "dir.h" #include "fsmonitor-ll.h" +#include "advice.h" + +/** + * This global is used by expand_index() to determine if we should give the + * advice for advice.sparseIndexExpanded when expanding a sparse index to a full + * one. However, this is sometimes done on purpose, such as in the sparse-checkout + * builtin, even when index.sparse=false. This may be disabled in + * convert_to_sparse(). + */ +static int give_advice_on_expansion = 1; +#define ADVICE_MSG \ + "The sparse index is expanding to a full index, a slow operation.\n" \ + "Your working directory likely has contents that are outside of\n" \ + "your sparse-checkout patterns. Use 'git sparse-checkout list' to\n" \ + "see your sparse-checkout definition and compare it to your working\n" \ + "directory contents. Running 'git clean' may assist in this cleanup." struct modify_index_context { struct index_state *write; @@ -184,6 +200,12 @@ int convert_to_sparse(struct index_state *istate, int flags) return 0; /* + * If we are purposefully collapsing a full index, then don't give + * advice when it is expanded later. + */ + give_advice_on_expansion = 0; + + /* * NEEDSWORK: If we have unmerged entries, then stay full. * Unmerged entries prevent the cache-tree extension from working. */ @@ -328,6 +350,12 @@ void expand_index(struct index_state *istate, struct pattern_list *pl) pl = NULL; } + if (!pl && give_advice_on_expansion) { + give_advice_on_expansion = 0; + advise_if_enabled(ADVICE_SPARSE_INDEX_EXPANDED, + _(ADVICE_MSG)); + } + /* * A NULL pattern set indicates we are expanding a full index, so * we use a special region name that indicates the full expansion. @@ -10,7 +10,7 @@ void strvec_init(struct strvec *array) memcpy(array, &blank, sizeof(*array)); } -static void strvec_push_nodup(struct strvec *array, const char *value) +void strvec_push_nodup(struct strvec *array, char *value) { if (array->v == empty_strvec) array->v = NULL; @@ -46,6 +46,9 @@ void strvec_init(struct strvec *); /* Push a copy of a string onto the end of the array. */ const char *strvec_push(struct strvec *, const char *); +/* Push an allocated string onto the end of the array, taking ownership. */ +void strvec_push_nodup(struct strvec *array, char *value); + /** * Format a string and push it onto the end of the array. This is a * convenience wrapper combining `strbuf_addf` and `strvec_push`. diff --git a/t/.gitattributes b/t/.gitattributes index b9cea1795d..7664c6e027 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -1,5 +1,5 @@ t[0-9][0-9][0-9][0-9]/* -whitespace -/chainlint/*.expect eol=lf +/chainlint/*.expect eol=lf -whitespace /t0110/url-* binary /t3206/* eol=lf /t3900/*.txt eol=lf diff --git a/t/Makefile b/t/Makefile index b2eb9f770b..4c30e7c06f 100644 --- a/t/Makefile +++ b/t/Makefile @@ -108,20 +108,8 @@ clean-chainlint: check-chainlint: @mkdir -p '$(CHAINLINTTMP_SQ)' && \ - for i in $(CHAINLINTTESTS); do \ - echo "test_expect_success '$$i' '" && \ - sed -e '/^# LINT: /d' chainlint/$$i.test && \ - echo "'"; \ - done >'$(CHAINLINTTMP_SQ)'/tests && \ - { \ - echo "# chainlint: $(CHAINLINTTMP_SQ)/tests" && \ - for i in $(CHAINLINTTESTS); do \ - echo "# chainlint: $$i" && \ - cat chainlint/$$i.expect; \ - done \ - } >'$(CHAINLINTTMP_SQ)'/expect && \ - $(CHAINLINT) --emit-all '$(CHAINLINTTMP_SQ)'/tests | \ - sed -e 's/^[1-9][0-9]* //' >'$(CHAINLINTTMP_SQ)'/actual && \ + '$(PERL_PATH_SQ)' chainlint-cat.pl '$(CHAINLINTTMP_SQ)' $(CHAINLINTTESTS) && \ + { $(CHAINLINT) --emit-all '$(CHAINLINTTMP_SQ)'/tests >'$(CHAINLINTTMP_SQ)'/actual || true; } && \ diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \ @@ -382,33 +382,9 @@ mapping between "TEST_PASSES_SANITIZE_LEAK=true" and those tests that pass under "SANITIZE=leak". This is especially useful when testing a series that fixes various memory leaks with "git rebase -x". -GIT_TEST_SANITIZE_LEAK_LOG=true will log memory leaks to -"test-results/$TEST_NAME.leak/trace.*" files. The logs include a -"dedup_token" (see +"ASAN_OPTIONS=help=1 ./git") and other options to -make logs +machine-readable. - -With GIT_TEST_SANITIZE_LEAK_LOG=true we'll look at the leak logs -before exiting and exit on failure if the logs showed that we had a -memory leak, even if the test itself would have otherwise passed. This -allows us to catch e.g. missing &&-chaining. This is especially useful -when combined with "GIT_TEST_PASSING_SANITIZE_LEAK", see below. - GIT_TEST_PASSING_SANITIZE_LEAK=check when combined with "--immediate" will run to completion faster, and result in the same failing -tests. The only practical reason to run -GIT_TEST_PASSING_SANITIZE_LEAK=check without "--immediate" is to -combine it with "GIT_TEST_SANITIZE_LEAK_LOG=true". If we stop at the -first failing test case our leak logs won't show subsequent leaks we -might have run into. - -GIT_TEST_PASSING_SANITIZE_LEAK=(true|check) will not catch all memory -leaks unless combined with GIT_TEST_SANITIZE_LEAK_LOG=true. Some tests -run "git" (or "test-tool" etc.) without properly checking the exit -code, or git will invoke itself and fail to ferry the abort() exit -code to the original caller. When the two modes are combined we'll -look at the "test-results/$TEST_NAME.leak/trace.*" files at the end of -the test run to see if had memory leaks which the test itself didn't -catch. +tests. GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version' default to n. @@ -906,6 +882,14 @@ see test-lib-functions.sh for the full list and their options. 'git-write-tree should be able to write an empty tree.' \ 'tree=$(git-write-tree)' + If <script> is `-` (a single dash), then the script to run is read + from stdin. This lets you more easily use single quotes within the + script by using a here-doc. For example: + + test_expect_success 'output contains expected string' - <<\EOT + grep "this string has 'quotes' in it" output + EOT + If you supply three parameters the first will be taken to be a prerequisite; see the test_set_prereq and test_have_prereq documentation below: diff --git a/t/chainlint-cat.pl b/t/chainlint-cat.pl new file mode 100644 index 0000000000..388f6e1e41 --- /dev/null +++ b/t/chainlint-cat.pl @@ -0,0 +1,29 @@ +#!/usr/bin/env perl + +my $outdir = shift; +open(my $tests, '>', "$outdir/tests") + or die "unable to open $outdir/tests: $!"; +open(my $expect, '>', "$outdir/expect") + or die "unable to open $outdir/expect: $!"; + +print $expect "# chainlint: $outdir/tests\n"; + +my $offset = 0; +for my $script (@ARGV) { + print $expect "# chainlint: $script\n"; + + open(my $expect_in, '<', "chainlint/$script.expect") + or die "unable to open chainlint/$script.expect: $!"; + while (<$expect_in>) { + s/^\d+/$& + $offset/e; + print $expect $_; + } + + open(my $test_in, '<', "chainlint/$script.test") + or die "unable to open chainlint/$script.test: $!"; + while (<$test_in>) { + /^# LINT: / and next; + print $tests $_; + $offset++; + } +} diff --git a/t/chainlint.pl b/t/chainlint.pl index 1bbd985b78..5361f23b1d 100755 --- a/t/chainlint.pl +++ b/t/chainlint.pl @@ -174,6 +174,10 @@ sub swallow_heredocs { $$b =~ /(?:\G|\n)$indent\Q$$tag[0]\E(?:\n|\z)/gc; if (pos($$b) > $start) { my $body = substr($$b, $start, pos($$b) - $start); + $self->{parser}->{heredocs}->{$$tag[0]} = { + content => substr($body, 0, length($body) - length($&)), + start_line => $self->{lineno}, + }; $self->{lineno} += () = $body =~ /\n/sg; next; } @@ -232,7 +236,8 @@ sub new { my $self = bless { buff => [], stop => [], - output => [] + output => [], + heredocs => {}, } => $class; $self->{lexer} = Lexer->new($self, $s); return $self; @@ -616,14 +621,21 @@ sub unwrap { sub check_test { my $self = shift @_; - my ($title, $body) = map(unwrap, @_); + my $title = unwrap(shift @_); + my $body = shift @_; + my $lineno = $body->[3]; + $body = unwrap($body); + if ($body eq '-') { + my $herebody = shift @_; + $body = $herebody->{content}; + $lineno = $herebody->{start_line}; + } $self->{ntests}++; my $parser = TestParser->new(\$body); my @tokens = $parser->parse(); my $problems = $parser->{problems}; return unless $emit_all || @$problems; my $c = main::fd_colors(1); - my $lineno = $_[1]->[3]; my $start = 0; my $checked = ''; for (sort {$a->[1]->[2] <=> $b->[1]->[2]} @$problems) { @@ -649,8 +661,13 @@ sub parse_cmd { return @tokens unless @tokens && $tokens[0]->[0] =~ /^test_expect_(?:success|failure)$/; my $n = $#tokens; $n-- while $n >= 0 && $tokens[$n]->[0] =~ /^(?:[;&\n|]|&&|\|\|)$/; - $self->check_test($tokens[1], $tokens[2]) if $n == 2; # title body - $self->check_test($tokens[2], $tokens[3]) if $n > 2; # prereq title body + my $herebody; + if ($n >= 2 && $tokens[$n-1]->[0] eq '-' && $tokens[$n]->[0] =~ /^<<-?(.+)$/) { + $herebody = $self->{heredocs}->{$1}; + $n--; + } + $self->check_test($tokens[1], $tokens[2], $herebody) if $n == 2; # title body + $self->check_test($tokens[2], $tokens[3], $herebody) if $n > 2; # prereq title body return @tokens; } @@ -762,7 +779,7 @@ sub check_script { while (my $path = $next_script->()) { $nscripts++; my $fh; - unless (open($fh, "<", $path)) { + unless (open($fh, "<:unix:crlf", $path)) { $emit->("?!ERR?! $path: $!\n"); next; } @@ -806,8 +823,10 @@ unless (@scripts) { show_stats($start_time, \@stats) if $show_stats; exit; } +$jobs = @scripts if @scripts < $jobs; -unless ($Config{useithreads} && eval { +unless ($jobs > 1 && + $Config{useithreads} && eval { require threads; threads->import(); require Thread::Queue; Thread::Queue->import(); 1; diff --git a/t/chainlint/arithmetic-expansion.expect b/t/chainlint/arithmetic-expansion.expect index 46ee1046af..338ecd5861 100644 --- a/t/chainlint/arithmetic-expansion.expect +++ b/t/chainlint/arithmetic-expansion.expect @@ -1,9 +1,9 @@ -( - foo && - bar=$((42 + 1)) && - baz -) && -( - bar=$((42 + 1)) ?!AMP?! - baz -) +2 ( +3 foo && +4 bar=$((42 + 1)) && +5 baz +6 ) && +7 ( +8 bar=$((42 + 1)) ?!AMP?! +9 baz +10 ) diff --git a/t/chainlint/arithmetic-expansion.test b/t/chainlint/arithmetic-expansion.test index 16206960d8..7b4c5c9a41 100644 --- a/t/chainlint/arithmetic-expansion.test +++ b/t/chainlint/arithmetic-expansion.test @@ -1,3 +1,4 @@ +test_expect_success 'arithmetic-expansion' ' ( foo && # LINT: closing ")" of $((...)) not misinterpreted as subshell-closing ")" @@ -9,3 +10,4 @@ bar=$((42 + 1)) baz ) +' diff --git a/t/chainlint/bash-array.expect b/t/chainlint/bash-array.expect index 4c34eaee45..435dc8bdc8 100644 --- a/t/chainlint/bash-array.expect +++ b/t/chainlint/bash-array.expect @@ -1,10 +1,10 @@ -( - foo && - bar=(gumbo stumbo wumbo) && - baz -) && -( - foo && - bar=${#bar[@]} && - baz -) +2 ( +3 foo && +4 bar=(gumbo stumbo wumbo) && +5 baz +6 ) && +7 ( +8 foo && +9 bar=${#bar[@]} && +10 baz +11 ) diff --git a/t/chainlint/bash-array.test b/t/chainlint/bash-array.test index 92bbb777b8..4ca977d299 100644 --- a/t/chainlint/bash-array.test +++ b/t/chainlint/bash-array.test @@ -1,3 +1,4 @@ +test_expect_success 'bash-array' ' ( foo && # LINT: ")" in Bash array assignment not misinterpreted as subshell-closing ")" @@ -10,3 +11,4 @@ bar=${#bar[@]} && baz ) +' diff --git a/t/chainlint/blank-line-before-esac.expect b/t/chainlint/blank-line-before-esac.expect index 056e03003d..b88ba919eb 100644 --- a/t/chainlint/blank-line-before-esac.expect +++ b/t/chainlint/blank-line-before-esac.expect @@ -1,18 +1,18 @@ -test_done () { - case "$test_failure" in - 0) - test_at_end_hook_ - - exit 0 ;; - - *) - if test $test_external_has_tap -eq 0 - then - say_color error "# failed $test_failure among $msg" - say "1..$test_count" - fi - - exit 1 ;; - - esac -} +2 test_done () { +3 case "$test_failure" in +4 0) +5 test_at_end_hook_ +6 +7 exit 0 ;; +8 +9 *) +10 if test $test_external_has_tap -eq 0 +11 then +12 say_color error "# failed $test_failure among $msg" +13 say "1..$test_count" +14 fi +15 +16 exit 1 ;; +17 +18 esac +19 } diff --git a/t/chainlint/blank-line-before-esac.test b/t/chainlint/blank-line-before-esac.test index cecccad19f..51f02ea0c5 100644 --- a/t/chainlint/blank-line-before-esac.test +++ b/t/chainlint/blank-line-before-esac.test @@ -1,3 +1,4 @@ +test_expect_success 'blank-line-before-esac' ' # LINT: blank line before "esac" test_done () { case "$test_failure" in @@ -17,3 +18,4 @@ test_done () { esac } +' diff --git a/t/chainlint/blank-line.expect b/t/chainlint/blank-line.expect index b47827d749..6ae39dd174 100644 --- a/t/chainlint/blank-line.expect +++ b/t/chainlint/blank-line.expect @@ -1,8 +1,8 @@ -( - - nothing && - - something - - -) +2 ( +3 +4 nothing && +5 +6 something +7 +8 +9 ) diff --git a/t/chainlint/blank-line.test b/t/chainlint/blank-line.test index 0fdf15b3e1..6f29a491de 100644 --- a/t/chainlint/blank-line.test +++ b/t/chainlint/blank-line.test @@ -1,3 +1,4 @@ +test_expect_success 'blank-line' ' ( nothing && @@ -8,3 +9,4 @@ ) +' diff --git a/t/chainlint/block-comment.expect b/t/chainlint/block-comment.expect index df2beea888..7926936c18 100644 --- a/t/chainlint/block-comment.expect +++ b/t/chainlint/block-comment.expect @@ -1,8 +1,8 @@ -( - { - # show a - echo a && - # show b - echo b - } -) +2 ( +3 { +4 # show a +5 echo a && +6 # show b +7 echo b +8 } +9 ) diff --git a/t/chainlint/block-comment.test b/t/chainlint/block-comment.test index df2beea888..934ef4113a 100644 --- a/t/chainlint/block-comment.test +++ b/t/chainlint/block-comment.test @@ -1,3 +1,4 @@ +test_expect_success 'block-comment' ' ( { # show a @@ -6,3 +7,4 @@ echo b } ) +' diff --git a/t/chainlint/block.expect b/t/chainlint/block.expect index 1c87326364..b62e3d58c3 100644 --- a/t/chainlint/block.expect +++ b/t/chainlint/block.expect @@ -1,23 +1,23 @@ -( - foo && - { - echo a ?!AMP?! - echo b - } && - bar && - { - echo c - } ?!AMP?! - baz -) && - -{ - echo a; ?!AMP?! echo b -} && -{ echo a; ?!AMP?! echo b; } && - -{ - echo "${var}9" && - echo "done" -} && -finis +2 ( +3 foo && +4 { +5 echo a ?!AMP?! +6 echo b +7 } && +8 bar && +9 { +10 echo c +11 } ?!AMP?! +12 baz +13 ) && +14 +15 { +16 echo a; ?!AMP?! echo b +17 } && +18 { echo a; ?!AMP?! echo b; } && +19 +20 { +21 echo "${var}9" && +22 echo "done" +23 } && +24 finis diff --git a/t/chainlint/block.test b/t/chainlint/block.test index 4ab69a4afc..a1b6b4dd32 100644 --- a/t/chainlint/block.test +++ b/t/chainlint/block.test @@ -1,3 +1,4 @@ +test_expect_success 'block' ' ( # LINT: missing "&&" after first "echo" foo && @@ -25,3 +26,4 @@ echo "done" } && finis +' diff --git a/t/chainlint/broken-chain.expect b/t/chainlint/broken-chain.expect index cfb58fb6b9..9a1838736f 100644 --- a/t/chainlint/broken-chain.expect +++ b/t/chainlint/broken-chain.expect @@ -1,6 +1,6 @@ -( - foo && - bar ?!AMP?! - baz && - wop -) +2 ( +3 foo && +4 bar ?!AMP?! +5 baz && +6 wop +7 ) diff --git a/t/chainlint/broken-chain.test b/t/chainlint/broken-chain.test index 2a44aa73b7..1966499ef9 100644 --- a/t/chainlint/broken-chain.test +++ b/t/chainlint/broken-chain.test @@ -1,3 +1,4 @@ +test_expect_success 'broken-chain' ' ( foo && # LINT: missing "&&" from "bar" @@ -6,3 +7,4 @@ # LINT: final statement before closing ")" legitimately lacks "&&" wop ) +' diff --git a/t/chainlint/case-comment.expect b/t/chainlint/case-comment.expect index 641c157b98..2442dd5f25 100644 --- a/t/chainlint/case-comment.expect +++ b/t/chainlint/case-comment.expect @@ -1,11 +1,11 @@ -( - case "$x" in - # found foo - x) foo ;; - # found other - *) - # treat it as bar - bar - ;; - esac -) +2 ( +3 case "$x" in +4 # found foo +5 x) foo ;; +6 # found other +7 *) +8 # treat it as bar +9 bar +10 ;; +11 esac +12 ) diff --git a/t/chainlint/case-comment.test b/t/chainlint/case-comment.test index 641c157b98..3f31ae9010 100644 --- a/t/chainlint/case-comment.test +++ b/t/chainlint/case-comment.test @@ -1,3 +1,4 @@ +test_expect_success 'case-comment' ' ( case "$x" in # found foo @@ -9,3 +10,4 @@ ;; esac ) +' diff --git a/t/chainlint/case.expect b/t/chainlint/case.expect index 31f280d8ce..c04c61ff36 100644 --- a/t/chainlint/case.expect +++ b/t/chainlint/case.expect @@ -1,19 +1,19 @@ -( - case "$x" in - x) foo ;; - *) bar ;; - esac && - foobar -) && -( - case "$x" in - x) foo ;; - *) bar ;; - esac ?!AMP?! - foobar -) && -( - case "$x" in 1) true;; esac && - case "$y" in 2) false;; esac ?!AMP?! - foobar -) +2 ( +3 case "$x" in +4 x) foo ;; +5 *) bar ;; +6 esac && +7 foobar +8 ) && +9 ( +10 case "$x" in +11 x) foo ;; +12 *) bar ;; +13 esac ?!AMP?! +14 foobar +15 ) && +16 ( +17 case "$x" in 1) true;; esac && +18 case "$y" in 2) false;; esac ?!AMP?! +19 foobar +20 ) diff --git a/t/chainlint/case.test b/t/chainlint/case.test index 4cb086bf87..bea21fee4f 100644 --- a/t/chainlint/case.test +++ b/t/chainlint/case.test @@ -1,3 +1,4 @@ +test_expect_success 'case' ' ( # LINT: "...)" arms in "case" not misinterpreted as subshell-closing ")" case "$x" in @@ -21,3 +22,4 @@ case "$y" in 2) false;; esac foobar ) +' diff --git a/t/chainlint/chain-break-background.expect b/t/chainlint/chain-break-background.expect index 20d0bb5333..d06deadae7 100644 --- a/t/chainlint/chain-break-background.expect +++ b/t/chainlint/chain-break-background.expect @@ -1,9 +1,9 @@ -JGIT_DAEMON_PID= && -git init --bare empty.git && ->empty.git/git-daemon-export-ok && -mkfifo jgit_daemon_output && -{ - jgit daemon --port="$JGIT_DAEMON_PORT" . >jgit_daemon_output & - JGIT_DAEMON_PID=$! -} && -test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git +2 JGIT_DAEMON_PID= && +3 git init --bare empty.git && +4 >empty.git/git-daemon-export-ok && +5 mkfifo jgit_daemon_output && +6 { +7 jgit daemon --port="$JGIT_DAEMON_PORT" . >jgit_daemon_output & +8 JGIT_DAEMON_PID=$! +9 } && +10 test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git diff --git a/t/chainlint/chain-break-background.test b/t/chainlint/chain-break-background.test index e10f656b05..c68e1b04d5 100644 --- a/t/chainlint/chain-break-background.test +++ b/t/chainlint/chain-break-background.test @@ -1,3 +1,4 @@ +test_expect_success 'chain-break-background' ' JGIT_DAEMON_PID= && git init --bare empty.git && >empty.git/git-daemon-export-ok && @@ -8,3 +9,4 @@ mkfifo jgit_daemon_output && JGIT_DAEMON_PID=$! } && test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git +' diff --git a/t/chainlint/chain-break-continue.expect b/t/chainlint/chain-break-continue.expect index 47a3457710..4bb60aae25 100644 --- a/t/chainlint/chain-break-continue.expect +++ b/t/chainlint/chain-break-continue.expect @@ -1,12 +1,12 @@ -git ls-tree --name-only -r refs/notes/many_notes | -while read path -do - test "$path" = "foobar/non-note.txt" && continue - test "$path" = "deadbeef" && continue - test "$path" = "de/adbeef" && continue - - if test $(expr length "$path") -ne $hexsz - then - return 1 - fi -done +2 git ls-tree --name-only -r refs/notes/many_notes | +3 while read path +4 do +5 test "$path" = "foobar/non-note.txt" && continue +6 test "$path" = "deadbeef" && continue +7 test "$path" = "de/adbeef" && continue +8 +9 if test $(expr length "$path") -ne $hexsz +10 then +11 return 1 +12 fi +13 done diff --git a/t/chainlint/chain-break-continue.test b/t/chainlint/chain-break-continue.test index f0af71d8bd..de8119b204 100644 --- a/t/chainlint/chain-break-continue.test +++ b/t/chainlint/chain-break-continue.test @@ -1,3 +1,4 @@ +test_expect_success 'chain-break-continue' ' git ls-tree --name-only -r refs/notes/many_notes | while read path do @@ -11,3 +12,4 @@ do return 1 fi done +' diff --git a/t/chainlint/chain-break-false.expect b/t/chainlint/chain-break-false.expect index 989766fb85..4f815f8e14 100644 --- a/t/chainlint/chain-break-false.expect +++ b/t/chainlint/chain-break-false.expect @@ -1,9 +1,9 @@ -if condition not satisified -then - echo it did not work... - echo failed! - false -else - echo it went okay ?!AMP?! - congratulate user -fi +2 if condition not satisified +3 then +4 echo it did not work... +5 echo failed! +6 false +7 else +8 echo it went okay ?!AMP?! +9 congratulate user +10 fi diff --git a/t/chainlint/chain-break-false.test b/t/chainlint/chain-break-false.test index a5aaff8c8a..f78ad911fc 100644 --- a/t/chainlint/chain-break-false.test +++ b/t/chainlint/chain-break-false.test @@ -1,3 +1,4 @@ +test_expect_success 'chain-break-false' ' # LINT: broken &&-chain okay if explicit "false" signals failure if condition not satisified then @@ -8,3 +9,4 @@ else echo it went okay congratulate user fi +' diff --git a/t/chainlint/chain-break-return-exit.expect b/t/chainlint/chain-break-return-exit.expect index 4cd18e2edf..ba0ec51aa0 100644 --- a/t/chainlint/chain-break-return-exit.expect +++ b/t/chainlint/chain-break-return-exit.expect @@ -1,19 +1,19 @@ -case "$(git ls-files)" in -one) echo pass one ;; -*) echo bad one; return 1 ;; -esac && -( - case "$(git ls-files)" in - two) echo pass two ;; - *) echo bad two; exit 1 ;; - esac -) && -case "$(git ls-files)" in -dir/two"$LF"one) echo pass both ;; -*) echo bad; return 1 ;; -esac && - -for i in 1 2 3 4 ; do - git checkout main -b $i || return $? - test_commit $i $i $i tag$i || return $? -done +2 case "$(git ls-files)" in +3 one) echo pass one ;; +4 *) echo bad one; return 1 ;; +5 esac && +6 ( +7 case "$(git ls-files)" in +8 two) echo pass two ;; +9 *) echo bad two; exit 1 ;; +10 esac +11 ) && +12 case "$(git ls-files)" in +13 dir/two"$LF"one) echo pass both ;; +14 *) echo bad; return 1 ;; +15 esac && +16 +17 for i in 1 2 3 4 ; do +18 git checkout main -b $i || return $? +19 test_commit $i $i $i tag$i || return $? +20 done diff --git a/t/chainlint/chain-break-return-exit.test b/t/chainlint/chain-break-return-exit.test index 46542edf88..b6f519bb4d 100644 --- a/t/chainlint/chain-break-return-exit.test +++ b/t/chainlint/chain-break-return-exit.test @@ -1,3 +1,4 @@ +test_expect_success 'chain-break-return-exit' ' case "$(git ls-files)" in one) echo pass one ;; # LINT: broken &&-chain okay if explicit "return 1" signals failuire @@ -21,3 +22,4 @@ for i in 1 2 3 4 ; do git checkout main -b $i || return $? test_commit $i $i $i tag$i || return $? done +' diff --git a/t/chainlint/chain-break-status.expect b/t/chainlint/chain-break-status.expect index e6b3b2193e..23c0caa7d8 100644 --- a/t/chainlint/chain-break-status.expect +++ b/t/chainlint/chain-break-status.expect @@ -1,9 +1,9 @@ -OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) && -test_match_signal 13 "$OUT" && - -{ test-tool sigchain >actual; ret=$?; } && -{ - test_match_signal 15 "$ret" || - test "$ret" = 3 -} && -test_cmp expect actual +2 OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) && +3 test_match_signal 13 "$OUT" && +4 +5 { test-tool sigchain >actual; ret=$?; } && +6 { +7 test_match_signal 15 "$ret" || +8 test "$ret" = 3 +9 } && +10 test_cmp expect actual diff --git a/t/chainlint/chain-break-status.test b/t/chainlint/chain-break-status.test index a6602a7b99..d9fee190d9 100644 --- a/t/chainlint/chain-break-status.test +++ b/t/chainlint/chain-break-status.test @@ -1,3 +1,4 @@ +test_expect_success 'chain-break-status' ' # LINT: broken &&-chain okay if next command handles "$?" explicitly OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) && test_match_signal 13 "$OUT" && @@ -9,3 +10,4 @@ test_match_signal 13 "$OUT" && test "$ret" = 3 } && test_cmp expect actual +' diff --git a/t/chainlint/chained-block.expect b/t/chainlint/chained-block.expect index 574cdceb07..a546b714a6 100644 --- a/t/chainlint/chained-block.expect +++ b/t/chainlint/chained-block.expect @@ -1,9 +1,9 @@ -echo nobody home && { - test the doohicky ?!AMP?! - right now -} && - -GIT_EXTERNAL_DIFF=echo git diff | { - read path oldfile oldhex oldmode newfile newhex newmode && - test "z$oh" = "z$oldhex" -} +2 echo nobody home && { +3 test the doohicky ?!AMP?! +4 right now +5 } && +6 +7 GIT_EXTERNAL_DIFF=echo git diff | { +8 read path oldfile oldhex oldmode newfile newhex newmode && +9 test "z$oh" = "z$oldhex" +10 } diff --git a/t/chainlint/chained-block.test b/t/chainlint/chained-block.test index 86f81ece63..71ef1d0b7f 100644 --- a/t/chainlint/chained-block.test +++ b/t/chainlint/chained-block.test @@ -1,3 +1,4 @@ +test_expect_success 'chained-block' ' # LINT: start of block chained to preceding command echo nobody home && { test the doohicky @@ -9,3 +10,4 @@ GIT_EXTERNAL_DIFF=echo git diff | { read path oldfile oldhex oldmode newfile newhex newmode && test "z$oh" = "z$oldhex" } +' diff --git a/t/chainlint/chained-subshell.expect b/t/chainlint/chained-subshell.expect index 83810ea7ec..f78b268291 100644 --- a/t/chainlint/chained-subshell.expect +++ b/t/chainlint/chained-subshell.expect @@ -1,10 +1,10 @@ -mkdir sub && ( - cd sub && - foo the bar ?!AMP?! - nuff said -) && - -cut "-d " -f actual | (read s1 s2 s3 && -test -f $s1 ?!AMP?! -test $(cat $s2) = tree2path1 && -test $(cat $s3) = tree3path1) +2 mkdir sub && ( +3 cd sub && +4 foo the bar ?!AMP?! +5 nuff said +6 ) && +7 +8 cut "-d " -f actual | (read s1 s2 s3 && +9 test -f $s1 ?!AMP?! +10 test $(cat $s2) = tree2path1 && +11 test $(cat $s3) = tree3path1) diff --git a/t/chainlint/chained-subshell.test b/t/chainlint/chained-subshell.test index 4ff6ddd8cb..1f11f65398 100644 --- a/t/chainlint/chained-subshell.test +++ b/t/chainlint/chained-subshell.test @@ -1,3 +1,4 @@ +test_expect_success 'chained-subshell' ' # LINT: start of subshell chained to preceding command mkdir sub && ( cd sub && @@ -11,3 +12,4 @@ test -f $s1 test $(cat $s2) = tree2path1 && # LINT: closing subshell ")" correctly detected on same line as "$(...)" test $(cat $s3) = tree3path1) +' diff --git a/t/chainlint/close-nested-and-parent-together.expect b/t/chainlint/close-nested-and-parent-together.expect index 72d482f76d..4167e54a59 100644 --- a/t/chainlint/close-nested-and-parent-together.expect +++ b/t/chainlint/close-nested-and-parent-together.expect @@ -1,3 +1,3 @@ -(cd foo && - (bar && - baz)) +2 (cd foo && +3 (bar && +4 baz)) diff --git a/t/chainlint/close-nested-and-parent-together.test b/t/chainlint/close-nested-and-parent-together.test index 72d482f76d..56b28b186b 100644 --- a/t/chainlint/close-nested-and-parent-together.test +++ b/t/chainlint/close-nested-and-parent-together.test @@ -1,3 +1,5 @@ +test_expect_success 'close-nested-and-parent-together' ' (cd foo && (bar && baz)) +' diff --git a/t/chainlint/close-subshell.expect b/t/chainlint/close-subshell.expect index 2192a2870a..a272cfe72e 100644 --- a/t/chainlint/close-subshell.expect +++ b/t/chainlint/close-subshell.expect @@ -1,26 +1,26 @@ -( - foo -) && -( - bar -) >out && -( - baz -) 2>err && -( - boo -) <input && -( - bip -) | wuzzle && -( - bop -) | fazz \ - fozz && -( - bup -) | -fuzzle && -( - yop -) +2 ( +3 foo +4 ) && +5 ( +6 bar +7 ) >out && +8 ( +9 baz +10 ) 2>err && +11 ( +12 boo +13 ) <input && +14 ( +15 bip +16 ) | wuzzle && +17 ( +18 bop +19 ) | fazz \ +20 fozz && +21 ( +22 bup +23 ) | +24 fuzzle && +25 ( +26 yop +27 ) diff --git a/t/chainlint/close-subshell.test b/t/chainlint/close-subshell.test index 508ca447fd..b99f80569d 100644 --- a/t/chainlint/close-subshell.test +++ b/t/chainlint/close-subshell.test @@ -1,3 +1,4 @@ +test_expect_success 'close-subshell' ' # LINT: closing ")" with various decorations ("&&", ">", "|", etc.) ( foo @@ -25,3 +26,4 @@ fuzzle && ( yop ) +' diff --git a/t/chainlint/command-substitution-subsubshell.expect b/t/chainlint/command-substitution-subsubshell.expect index ec42f2c30c..f2a9312dc8 100644 --- a/t/chainlint/command-substitution-subsubshell.expect +++ b/t/chainlint/command-substitution-subsubshell.expect @@ -1,2 +1,2 @@ -OUT=$( ((large_git 1>&3) | :) 3>&1 ) && -test_match_signal 13 "$OUT" +2 OUT=$( ((large_git 1>&3) | :) 3>&1 ) && +3 test_match_signal 13 "$OUT" diff --git a/t/chainlint/command-substitution-subsubshell.test b/t/chainlint/command-substitution-subsubshell.test index 321de2951c..4ea772d60a 100644 --- a/t/chainlint/command-substitution-subsubshell.test +++ b/t/chainlint/command-substitution-subsubshell.test @@ -1,3 +1,5 @@ +test_expect_success 'command-substitution-subsubshell' ' # LINT: subshell nested in subshell nested in command substitution OUT=$( ((large_git 1>&3) | :) 3>&1 ) && test_match_signal 13 "$OUT" +' diff --git a/t/chainlint/command-substitution.expect b/t/chainlint/command-substitution.expect index c72e4df9e7..5e31b36db6 100644 --- a/t/chainlint/command-substitution.expect +++ b/t/chainlint/command-substitution.expect @@ -1,9 +1,9 @@ -( - foo && - bar=$(gobble) && - baz -) && -( - bar=$(gobble blocks) ?!AMP?! - baz -) +2 ( +3 foo && +4 bar=$(gobble) && +5 baz +6 ) && +7 ( +8 bar=$(gobble blocks) ?!AMP?! +9 baz +10 ) diff --git a/t/chainlint/command-substitution.test b/t/chainlint/command-substitution.test index 3bbb002a4c..494d671e80 100644 --- a/t/chainlint/command-substitution.test +++ b/t/chainlint/command-substitution.test @@ -1,3 +1,4 @@ +test_expect_success 'command-substitution' ' ( foo && # LINT: closing ")" of $(...) not misinterpreted as subshell-closing ")" @@ -9,3 +10,4 @@ bar=$(gobble blocks) baz ) +' diff --git a/t/chainlint/comment.expect b/t/chainlint/comment.expect index a68f1f9d7c..584098d6ba 100644 --- a/t/chainlint/comment.expect +++ b/t/chainlint/comment.expect @@ -1,8 +1,8 @@ -( - # comment 1 - nothing && - # comment 2 - something - # comment 3 - # comment 4 -) +2 ( +3 # comment 1 +4 nothing && +5 # comment 2 +6 something +7 # comment 3 +8 # comment 4 +9 ) diff --git a/t/chainlint/comment.test b/t/chainlint/comment.test index 113c0c466f..c488beac0d 100644 --- a/t/chainlint/comment.test +++ b/t/chainlint/comment.test @@ -1,3 +1,4 @@ +test_expect_success 'comment' ' ( # LINT: swallow comment lines # comment 1 @@ -9,3 +10,4 @@ # comment 3 # comment 4 ) +' diff --git a/t/chainlint/complex-if-in-cuddled-loop.expect b/t/chainlint/complex-if-in-cuddled-loop.expect index dac2d0fd1d..3a740103db 100644 --- a/t/chainlint/complex-if-in-cuddled-loop.expect +++ b/t/chainlint/complex-if-in-cuddled-loop.expect @@ -1,9 +1,9 @@ -(for i in a b c; do - if test "$(echo $(waffle bat))" = "eleventeen" && - test "$x" = "$y"; then - : - else - echo >file - fi ?!LOOP?! - done) && -test ! -f file +2 (for i in a b c; do +3 if test "$(echo $(waffle bat))" = "eleventeen" && +4 test "$x" = "$y"; then +5 : +6 else +7 echo >file +8 fi ?!LOOP?! +9 done) && +10 test ! -f file diff --git a/t/chainlint/complex-if-in-cuddled-loop.test b/t/chainlint/complex-if-in-cuddled-loop.test index 5efeda58b2..f98ae4c42d 100644 --- a/t/chainlint/complex-if-in-cuddled-loop.test +++ b/t/chainlint/complex-if-in-cuddled-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'complex-if-in-cuddled-loop' ' # LINT: "for" loop cuddled with "(" and ")" and nested "if" with complex # LINT: multi-line condition; indented with spaces, not tabs (for i in a b c; do @@ -9,3 +10,4 @@ fi done) && test ! -f file +' diff --git a/t/chainlint/cuddled-if-then-else.expect b/t/chainlint/cuddled-if-then-else.expect index 1d8ed58c49..72da8794cb 100644 --- a/t/chainlint/cuddled-if-then-else.expect +++ b/t/chainlint/cuddled-if-then-else.expect @@ -1,6 +1,6 @@ -(if test -z ""; then - echo empty - else - echo bizzy - fi) && -echo foobar +2 (if test -z ""; then +3 echo empty +4 else +5 echo bizzy +6 fi) && +7 echo foobar diff --git a/t/chainlint/cuddled-if-then-else.test b/t/chainlint/cuddled-if-then-else.test index 7c53f4efe3..b1b42e1aac 100644 --- a/t/chainlint/cuddled-if-then-else.test +++ b/t/chainlint/cuddled-if-then-else.test @@ -1,3 +1,4 @@ +test_expect_success 'cuddled-if-then-else' ' # LINT: "if" cuddled with "(" and ")"; indented with spaces, not tabs (if test -z ""; then echo empty @@ -5,3 +6,4 @@ echo bizzy fi) && echo foobar +' diff --git a/t/chainlint/cuddled-loop.expect b/t/chainlint/cuddled-loop.expect index 9cf260708e..c38585c756 100644 --- a/t/chainlint/cuddled-loop.expect +++ b/t/chainlint/cuddled-loop.expect @@ -1,4 +1,4 @@ -( while read x - do foobar bop || exit 1 - done <file ) && -outside subshell +2 ( while read x +3 do foobar bop || exit 1 +4 done <file ) && +5 outside subshell diff --git a/t/chainlint/cuddled-loop.test b/t/chainlint/cuddled-loop.test index 3c2a62f751..6fccb6ac22 100644 --- a/t/chainlint/cuddled-loop.test +++ b/t/chainlint/cuddled-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'cuddled-loop' ' # LINT: "while" loop cuddled with "(" and ")", with embedded (allowed) # LINT: "|| exit {n}" to exit loop early, and using redirection "<" to feed # LINT: loop; indented with spaces, not tabs @@ -5,3 +6,4 @@ do foobar bop || exit 1 done <file ) && outside subshell +' diff --git a/t/chainlint/cuddled.expect b/t/chainlint/cuddled.expect index c3e0be4047..b06d638311 100644 --- a/t/chainlint/cuddled.expect +++ b/t/chainlint/cuddled.expect @@ -1,17 +1,17 @@ -(cd foo && - bar -) && - -(cd foo ?!AMP?! - bar -) && - -( - cd foo && - bar) && - -(cd foo && - bar) && - -(cd foo ?!AMP?! - bar) +2 (cd foo && +3 bar +4 ) && +5 +6 (cd foo ?!AMP?! +7 bar +8 ) && +9 +10 ( +11 cd foo && +12 bar) && +13 +14 (cd foo && +15 bar) && +16 +17 (cd foo ?!AMP?! +18 bar) diff --git a/t/chainlint/cuddled.test b/t/chainlint/cuddled.test index 257b5b5eed..5a6ef7a4a6 100644 --- a/t/chainlint/cuddled.test +++ b/t/chainlint/cuddled.test @@ -1,3 +1,4 @@ +test_expect_success 'cuddled' ' # LINT: first subshell statement cuddled with opening "(" (cd foo && bar @@ -20,3 +21,4 @@ # LINT: same with missing "&&" (cd foo bar) +' diff --git a/t/chainlint/double-here-doc.expect b/t/chainlint/double-here-doc.expect index cd584a4357..48c04ecd58 100644 --- a/t/chainlint/double-here-doc.expect +++ b/t/chainlint/double-here-doc.expect @@ -1,12 +1,12 @@ -run_sub_test_lib_test_err run-inv-range-start \ - "--run invalid range start" \ - --run="a-5" <<-\EOF && -test_expect_success "passing test #1" "true" -test_done -EOF -check_sub_test_lib_test_err run-inv-range-start \ - <<-\EOF_OUT 3<<-EOF_ERR -> FATAL: Unexpected exit with code 1 -EOF_OUT -> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ} -EOF_ERR +2 run_sub_test_lib_test_err run-inv-range-start \ +3 "--run invalid range start" \ +4 --run="a-5" <<-\EOF && +5 test_expect_success "passing test #1" "true" +6 test_done +7 EOF +8 check_sub_test_lib_test_err run-inv-range-start \ +9 <<-\EOF_OUT 3<<-EOF_ERR +10 > FATAL: Unexpected exit with code 1 +11 EOF_OUT +12 > error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ} +13 EOF_ERR diff --git a/t/chainlint/double-here-doc.test b/t/chainlint/double-here-doc.test index cd584a4357..1b69b7a651 100644 --- a/t/chainlint/double-here-doc.test +++ b/t/chainlint/double-here-doc.test @@ -1,3 +1,4 @@ +test_expect_success 'double-here-doc' ' run_sub_test_lib_test_err run-inv-range-start \ "--run invalid range start" \ --run="a-5" <<-\EOF && @@ -10,3 +11,4 @@ check_sub_test_lib_test_err run-inv-range-start \ EOF_OUT > error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ} EOF_ERR +' diff --git a/t/chainlint/dqstring-line-splice.expect b/t/chainlint/dqstring-line-splice.expect index 37eab80738..2ca1c92cd6 100644 --- a/t/chainlint/dqstring-line-splice.expect +++ b/t/chainlint/dqstring-line-splice.expect @@ -1,5 +1,5 @@ - -echo 'fatal: reword option of --fixup is mutually exclusive with' '--patch/--interactive/--all/--include/--only' >expect && -test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual && -test_cmp expect actual - +2 +3 echo 'fatal: reword option of --fixup is mutually exclusive with' '--patch/--interactive/--all/--include/--only' >expect && +4 test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual && +5 test_cmp expect actual +6 diff --git a/t/chainlint/dqstring-line-splice.test b/t/chainlint/dqstring-line-splice.test index b40714439f..f6aa637be8 100644 --- a/t/chainlint/dqstring-line-splice.test +++ b/t/chainlint/dqstring-line-splice.test @@ -1,3 +1,4 @@ +test_expect_success 'dqstring-line-splice' ' # LINT: line-splice within DQ-string '" echo 'fatal: reword option of --fixup is mutually exclusive with'\ @@ -5,3 +6,4 @@ echo 'fatal: reword option of --fixup is mutually exclusive with'\ test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual && test_cmp expect actual "' +' diff --git a/t/chainlint/dqstring-no-interpolate.expect b/t/chainlint/dqstring-no-interpolate.expect index 087eda15e4..c9f75849c5 100644 --- a/t/chainlint/dqstring-no-interpolate.expect +++ b/t/chainlint/dqstring-no-interpolate.expect @@ -1,12 +1,12 @@ -grep "^ ! [rejected][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" out && - -grep "^\.git$" output.txt && - - -( - cd client$version && - GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. $(cat ../input) -) >output && - cut -d ' ' -f 2 <output | sort >actual && - test_cmp expect actual - +2 grep "^ ! [rejected][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" out && +3 +4 grep "^\.git$" output.txt && +5 +6 +7 ( +8 cd client$version && +9 GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. $(cat ../input) +10 ) >output && +11 cut -d ' ' -f 2 <output | sort >actual && +12 test_cmp expect actual +13 diff --git a/t/chainlint/dqstring-no-interpolate.test b/t/chainlint/dqstring-no-interpolate.test index d2f4219cbb..7ae079b558 100644 --- a/t/chainlint/dqstring-no-interpolate.test +++ b/t/chainlint/dqstring-no-interpolate.test @@ -1,3 +1,4 @@ +test_expect_success 'dqstring-no-interpolate' ' # LINT: regex dollar-sign eol anchor in double-quoted string not special grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" out && @@ -13,3 +14,4 @@ grep "^\\.git\$" output.txt && cut -d ' ' -f 2 <output | sort >actual && test_cmp expect actual "' +' diff --git a/t/chainlint/empty-here-doc.expect b/t/chainlint/empty-here-doc.expect index 8507721192..54b33f823a 100644 --- a/t/chainlint/empty-here-doc.expect +++ b/t/chainlint/empty-here-doc.expect @@ -1,4 +1,4 @@ -git ls-tree $tree path >current && -cat >expected <<\EOF && -EOF -test_output +2 git ls-tree $tree path >current && +3 cat >expected <<\EOF && +4 EOF +5 test_output diff --git a/t/chainlint/empty-here-doc.test b/t/chainlint/empty-here-doc.test index 24fc165de3..8b7ab6eb5f 100644 --- a/t/chainlint/empty-here-doc.test +++ b/t/chainlint/empty-here-doc.test @@ -1,5 +1,7 @@ +test_expect_success 'empty-here-doc' ' git ls-tree $tree path >current && # LINT: empty here-doc cat >expected <<\EOF && EOF test_output +' diff --git a/t/chainlint/exclamation.expect b/t/chainlint/exclamation.expect index 765a35bb4c..078744b61b 100644 --- a/t/chainlint/exclamation.expect +++ b/t/chainlint/exclamation.expect @@ -1,4 +1,4 @@ -if ! condition; then echo nope; else yep; fi && -test_prerequisite !MINGW && -mail uucp!address && -echo !whatever! +2 if ! condition; then echo nope; else yep; fi && +3 test_prerequisite !MINGW && +4 mail uucp!address && +5 echo !whatever! diff --git a/t/chainlint/exclamation.test b/t/chainlint/exclamation.test index 323595b5bd..796de21b7c 100644 --- a/t/chainlint/exclamation.test +++ b/t/chainlint/exclamation.test @@ -1,3 +1,4 @@ +test_expect_success 'exclamation' ' # LINT: "! word" is two tokens if ! condition; then echo nope; else yep; fi && # LINT: "!word" is single token, not two tokens "!" and "word" @@ -6,3 +7,4 @@ test_prerequisite !MINGW && mail uucp!address && # LINT: "!word!" is single token, not three tokens "!", "word", and "!" echo !whatever! +' diff --git a/t/chainlint/exit-loop.expect b/t/chainlint/exit-loop.expect index f76aa60466..407278094c 100644 --- a/t/chainlint/exit-loop.expect +++ b/t/chainlint/exit-loop.expect @@ -1,24 +1,24 @@ -( - for i in a b c - do - foo || exit 1 - bar && - baz - done -) && -( - while true - do - foo || exit 1 - bar && - baz - done -) && -( - i=0 && - while test $i -lt 10 - do - echo $i || exit - i=$(($i + 1)) - done -) +2 ( +3 for i in a b c +4 do +5 foo || exit 1 +6 bar && +7 baz +8 done +9 ) && +10 ( +11 while true +12 do +13 foo || exit 1 +14 bar && +15 baz +16 done +17 ) && +18 ( +19 i=0 && +20 while test $i -lt 10 +21 do +22 echo $i || exit +23 i=$(($i + 1)) +24 done +25 ) diff --git a/t/chainlint/exit-loop.test b/t/chainlint/exit-loop.test index 2f038207e1..7e8b68b465 100644 --- a/t/chainlint/exit-loop.test +++ b/t/chainlint/exit-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'exit-loop' ' ( for i in a b c do @@ -25,3 +26,4 @@ i=$(($i + 1)) done ) +' diff --git a/t/chainlint/exit-subshell.expect b/t/chainlint/exit-subshell.expect index da80339f78..793db12453 100644 --- a/t/chainlint/exit-subshell.expect +++ b/t/chainlint/exit-subshell.expect @@ -1,5 +1,5 @@ -( - foo || exit 1 - bar && - baz -) +2 ( +3 foo || exit 1 +4 bar && +5 baz +6 ) diff --git a/t/chainlint/exit-subshell.test b/t/chainlint/exit-subshell.test index 4e6ab69b88..05dff55cd7 100644 --- a/t/chainlint/exit-subshell.test +++ b/t/chainlint/exit-subshell.test @@ -1,6 +1,8 @@ +test_expect_success 'exit-subshell' ' ( # LINT: "|| exit {n}" valid subshell escape without hurting &&-chain foo || exit 1 bar && baz ) +' diff --git a/t/chainlint/for-loop-abbreviated.expect b/t/chainlint/for-loop-abbreviated.expect index 02c0d15cca..5574831976 100644 --- a/t/chainlint/for-loop-abbreviated.expect +++ b/t/chainlint/for-loop-abbreviated.expect @@ -1,5 +1,5 @@ -for it -do - path=$(expr "$it" : ([^:]*)) && - git update-index --add "$path" || exit -done +2 for it +3 do +4 path=$(expr "$it" : ([^:]*)) && +5 git update-index --add "$path" || exit +6 done diff --git a/t/chainlint/for-loop-abbreviated.test b/t/chainlint/for-loop-abbreviated.test index 1084eccb89..1dd14f2a44 100644 --- a/t/chainlint/for-loop-abbreviated.test +++ b/t/chainlint/for-loop-abbreviated.test @@ -1,6 +1,8 @@ +test_expect_success 'for-loop-abbreviated' ' # LINT: for-loop lacking optional "in [word...]" before "do" for it do path=$(expr "$it" : '\([^:]*\)') && git update-index --add "$path" || exit done +' diff --git a/t/chainlint/for-loop.expect b/t/chainlint/for-loop.expect index d2237f1e38..908aeedf96 100644 --- a/t/chainlint/for-loop.expect +++ b/t/chainlint/for-loop.expect @@ -1,14 +1,14 @@ -( - for i in a b c - do - echo $i ?!AMP?! - cat <<-\EOF ?!LOOP?! - bar - EOF - done ?!AMP?! - - for i in a b c; do - echo $i && - cat $i ?!LOOP?! - done -) +2 ( +3 for i in a b c +4 do +5 echo $i ?!AMP?! +6 cat <<-\EOF ?!LOOP?! +7 bar +8 EOF +9 done ?!AMP?! +10 +11 for i in a b c; do +12 echo $i && +13 cat $i ?!LOOP?! +14 done +15 ) diff --git a/t/chainlint/for-loop.test b/t/chainlint/for-loop.test index 6cb3428158..6f2489eb19 100644 --- a/t/chainlint/for-loop.test +++ b/t/chainlint/for-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'for-loop' ' ( # LINT: "for", "do", "done" do not need "&&" for i in a b c @@ -17,3 +18,4 @@ cat $i done ) +' diff --git a/t/chainlint/function.expect b/t/chainlint/function.expect index dd7c997a3c..c226246b25 100644 --- a/t/chainlint/function.expect +++ b/t/chainlint/function.expect @@ -1,11 +1,11 @@ -sha1_file() { - echo "$*" | sed "s#..#.git/objects/&/#" -} && - -remove_object() { - file=$(sha1_file "$*") && - test -e "$file" ?!AMP?! - rm -f "$file" -} ?!AMP?! - -sha1_file arg && remove_object arg +2 sha1_file() { +3 echo "$*" | sed "s#..#.git/objects/&/#" +4 } && +5 +6 remove_object() { +7 file=$(sha1_file "$*") && +8 test -e "$file" ?!AMP?! +9 rm -f "$file" +10 } ?!AMP?! +11 +12 sha1_file arg && remove_object arg diff --git a/t/chainlint/function.test b/t/chainlint/function.test index 5ee59562c9..763fcf3f87 100644 --- a/t/chainlint/function.test +++ b/t/chainlint/function.test @@ -1,3 +1,4 @@ +test_expect_success 'function' ' # LINT: "()" in function definition not mistaken for subshell sha1_file() { echo "$*" | sed "s#..#.git/objects/&/#" @@ -11,3 +12,4 @@ remove_object() { } sha1_file arg && remove_object arg +' diff --git a/t/chainlint/here-doc-body-indent.expect b/t/chainlint/here-doc-body-indent.expect new file mode 100644 index 0000000000..4323acc93d --- /dev/null +++ b/t/chainlint/here-doc-body-indent.expect @@ -0,0 +1,2 @@ +2 echo "we should find this" ?!AMP?! +3 echo "even though our heredoc has its indent stripped" diff --git a/t/chainlint/here-doc-body-indent.test b/t/chainlint/here-doc-body-indent.test new file mode 100644 index 0000000000..39ff970ef3 --- /dev/null +++ b/t/chainlint/here-doc-body-indent.test @@ -0,0 +1,4 @@ +test_expect_success 'here-doc-body-indent' - <<-\EOT + echo "we should find this" + echo "even though our heredoc has its indent stripped" +EOT diff --git a/t/chainlint/here-doc-body-pathological.expect b/t/chainlint/here-doc-body-pathological.expect new file mode 100644 index 0000000000..a93a1fa3aa --- /dev/null +++ b/t/chainlint/here-doc-body-pathological.expect @@ -0,0 +1,7 @@ +2 echo "outer here-doc does not allow indented end-tag" ?!AMP?! +3 cat >file <<-\EOF && +4 but this inner here-doc +5 does allow indented EOF +6 EOF +7 echo "missing chain after" ?!AMP?! +8 echo "but this line is OK because it's the end" diff --git a/t/chainlint/here-doc-body-pathological.test b/t/chainlint/here-doc-body-pathological.test new file mode 100644 index 0000000000..7d2daa44f9 --- /dev/null +++ b/t/chainlint/here-doc-body-pathological.test @@ -0,0 +1,9 @@ +test_expect_success 'here-doc-body-pathological' - <<\EOF + echo "outer here-doc does not allow indented end-tag" + cat >file <<-\EOF && + but this inner here-doc + does allow indented EOF + EOF + echo "missing chain after" + echo "but this line is OK because it's the end" +EOF diff --git a/t/chainlint/here-doc-body.expect b/t/chainlint/here-doc-body.expect new file mode 100644 index 0000000000..ddf1c412af --- /dev/null +++ b/t/chainlint/here-doc-body.expect @@ -0,0 +1,7 @@ +2 echo "missing chain before" ?!AMP?! +3 cat >file <<-\EOF && +4 inside inner here-doc +5 these are not shell commands +6 EOF +7 echo "missing chain after" ?!AMP?! +8 echo "but this line is OK because it's the end" diff --git a/t/chainlint/here-doc-body.test b/t/chainlint/here-doc-body.test new file mode 100644 index 0000000000..989ac2f4e1 --- /dev/null +++ b/t/chainlint/here-doc-body.test @@ -0,0 +1,9 @@ +test_expect_success 'here-doc-body' - <<\EOT + echo "missing chain before" + cat >file <<-\EOF && + inside inner here-doc + these are not shell commands + EOF + echo "missing chain after" + echo "but this line is OK because it's the end" +EOT diff --git a/t/chainlint/here-doc-close-subshell.expect b/t/chainlint/here-doc-close-subshell.expect index 7d9c2b5607..965813f463 100644 --- a/t/chainlint/here-doc-close-subshell.expect +++ b/t/chainlint/here-doc-close-subshell.expect @@ -1,4 +1,4 @@ -( - cat <<-\INPUT) - fizz - INPUT +2 ( +3 cat <<-\INPUT) +4 fizz +5 INPUT diff --git a/t/chainlint/here-doc-close-subshell.test b/t/chainlint/here-doc-close-subshell.test index b857ff5467..2458f3323b 100644 --- a/t/chainlint/here-doc-close-subshell.test +++ b/t/chainlint/here-doc-close-subshell.test @@ -1,5 +1,7 @@ +test_expect_success 'here-doc-close-subshell' ' ( # LINT: line contains here-doc and closes nested subshell cat <<-\INPUT) fizz INPUT +' diff --git a/t/chainlint/here-doc-double.expect b/t/chainlint/here-doc-double.expect new file mode 100644 index 0000000000..20dba4b452 --- /dev/null +++ b/t/chainlint/here-doc-double.expect @@ -0,0 +1,2 @@ +8 echo "actual test commands" ?!AMP?! +9 echo "that should be checked" diff --git a/t/chainlint/here-doc-double.test b/t/chainlint/here-doc-double.test new file mode 100644 index 0000000000..777389f0d9 --- /dev/null +++ b/t/chainlint/here-doc-double.test @@ -0,0 +1,10 @@ +# This is obviously a ridiculous thing to do, but we should be able +# to handle two here-docs on the same line, and attribute them +# correctly. +test_expect_success "$(cat <<END_OF_PREREQS)" 'here-doc-double' - <<\EOT +SOME +PREREQS +END_OF_PREREQS + echo "actual test commands" + echo "that should be checked" +EOT diff --git a/t/chainlint/here-doc-indent-operator.expect b/t/chainlint/here-doc-indent-operator.expect index f92a7ce999..277a11202d 100644 --- a/t/chainlint/here-doc-indent-operator.expect +++ b/t/chainlint/here-doc-indent-operator.expect @@ -1,11 +1,11 @@ -cat >expect <<- EOF && -header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 -num_commits: $1 -chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data -EOF - -cat >expect << -EOF ?!AMP?! -this is not indented --EOF - -cleanup +2 cat >expect <<- EOF && +3 header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 +4 num_commits: $1 +5 chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data +6 EOF +7 +8 cat >expect << -EOF ?!AMP?! +9 this is not indented +10 -EOF +11 +12 cleanup diff --git a/t/chainlint/here-doc-indent-operator.test b/t/chainlint/here-doc-indent-operator.test index c8a6f18eb4..a2656f47c1 100644 --- a/t/chainlint/here-doc-indent-operator.test +++ b/t/chainlint/here-doc-indent-operator.test @@ -1,3 +1,4 @@ +test_expect_success 'here-doc-indent-operator' ' # LINT: whitespace between operator "<<-" and tag legal cat >expect <<- EOF && header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 @@ -11,3 +12,4 @@ this is not indented -EOF cleanup +' diff --git a/t/chainlint/here-doc-multi-line-command-subst.expect b/t/chainlint/here-doc-multi-line-command-subst.expect index b7364c82c8..41b55f6437 100644 --- a/t/chainlint/here-doc-multi-line-command-subst.expect +++ b/t/chainlint/here-doc-multi-line-command-subst.expect @@ -1,8 +1,8 @@ -( - x=$(bobble <<-\END && - fossil - vegetable - END - wiffle) ?!AMP?! - echo $x -) +2 ( +3 x=$(bobble <<-\END && +4 fossil +5 vegetable +6 END +7 wiffle) ?!AMP?! +8 echo $x +9 ) diff --git a/t/chainlint/here-doc-multi-line-command-subst.test b/t/chainlint/here-doc-multi-line-command-subst.test index 899bc5de8b..8710a8c483 100644 --- a/t/chainlint/here-doc-multi-line-command-subst.test +++ b/t/chainlint/here-doc-multi-line-command-subst.test @@ -1,3 +1,4 @@ +test_expect_success 'here-doc-multi-line-command-subst' ' ( # LINT: line contains here-doc and opens multi-line $(...) x=$(bobble <<-\END && @@ -7,3 +8,4 @@ wiffle) echo $x ) +' diff --git a/t/chainlint/here-doc-multi-line-string.expect b/t/chainlint/here-doc-multi-line-string.expect index 6c13bdcbfb..c71828589e 100644 --- a/t/chainlint/here-doc-multi-line-string.expect +++ b/t/chainlint/here-doc-multi-line-string.expect @@ -1,7 +1,7 @@ -( - cat <<-\TXT && echo "multi-line - string" ?!AMP?! - fizzle - TXT - bap -) +2 ( +3 cat <<-\TXT && echo "multi-line +4 string" ?!AMP?! +5 fizzle +6 TXT +7 bap +8 ) diff --git a/t/chainlint/here-doc-multi-line-string.test b/t/chainlint/here-doc-multi-line-string.test index a53edbcc8d..2f496002fd 100644 --- a/t/chainlint/here-doc-multi-line-string.test +++ b/t/chainlint/here-doc-multi-line-string.test @@ -1,3 +1,4 @@ +test_expect_success 'here-doc-multi-line-string' ' ( # LINT: line contains here-doc and opens multi-line string cat <<-\TXT && echo "multi-line @@ -6,3 +7,4 @@ TXT bap ) +' diff --git a/t/chainlint/here-doc.expect b/t/chainlint/here-doc.expect index 91b961242a..2c382dd8eb 100644 --- a/t/chainlint/here-doc.expect +++ b/t/chainlint/here-doc.expect @@ -1,25 +1,25 @@ -boodle wobba \ - gorgo snoot \ - wafta snurb <<EOF && -quoth the raven, -nevermore... -EOF - -cat <<-Arbitrary_Tag_42 >foo && -snoz -boz -woz -Arbitrary_Tag_42 - -cat <<"zump" >boo && -snoz -boz -woz -zump - -horticulture <<\EOF -gomez -morticia -wednesday -pugsly -EOF +2 boodle wobba \ +3 gorgo snoot \ +4 wafta snurb <<EOF && +5 quoth the raven, +6 nevermore... +7 EOF +8 +9 cat <<-Arbitrary_Tag_42 >foo && +10 snoz +11 boz +12 woz +13 Arbitrary_Tag_42 +14 +15 cat <<"zump" >boo && +16 snoz +17 boz +18 woz +19 zump +20 +21 horticulture <<\EOF +22 gomez +23 morticia +24 wednesday +25 pugsly +26 EOF diff --git a/t/chainlint/here-doc.test b/t/chainlint/here-doc.test index 3f5f92cad3..c91b695319 100644 --- a/t/chainlint/here-doc.test +++ b/t/chainlint/here-doc.test @@ -1,3 +1,4 @@ +test_expect_success 'here-doc' ' # LINT: stitch together incomplete \-ending lines # LINT: swallow here-doc to avoid false positives in content boodle wobba \ @@ -28,3 +29,4 @@ morticia wednesday pugsly EOF +' diff --git a/t/chainlint/if-condition-split.expect b/t/chainlint/if-condition-split.expect index ee745ef8d7..9daf3d294a 100644 --- a/t/chainlint/if-condition-split.expect +++ b/t/chainlint/if-condition-split.expect @@ -1,7 +1,7 @@ -if bob && - marcia || - kevin -then - echo "nomads" ?!AMP?! - echo "for sure" -fi +2 if bob && +3 marcia || +4 kevin +5 then +6 echo "nomads" ?!AMP?! +7 echo "for sure" +8 fi diff --git a/t/chainlint/if-condition-split.test b/t/chainlint/if-condition-split.test index 240daa9fd5..9a3b3ed04a 100644 --- a/t/chainlint/if-condition-split.test +++ b/t/chainlint/if-condition-split.test @@ -1,3 +1,4 @@ +test_expect_success 'if-condition-split' ' # LINT: "if" condition split across multiple lines at "&&" or "||" if bob && marcia || @@ -6,3 +7,4 @@ then echo "nomads" echo "for sure" fi +' diff --git a/t/chainlint/if-in-loop.expect b/t/chainlint/if-in-loop.expect index d6514ae749..ff8c60dbdb 100644 --- a/t/chainlint/if-in-loop.expect +++ b/t/chainlint/if-in-loop.expect @@ -1,12 +1,12 @@ -( - for i in a b c - do - if false - then - echo "err" - exit 1 - fi ?!AMP?! - foo - done ?!AMP?! - bar -) +2 ( +3 for i in a b c +4 do +5 if false +6 then +7 echo "err" +8 exit 1 +9 fi ?!AMP?! +10 foo +11 done ?!AMP?! +12 bar +13 ) diff --git a/t/chainlint/if-in-loop.test b/t/chainlint/if-in-loop.test index 90c23976fe..5be9d1cfa5 100644 --- a/t/chainlint/if-in-loop.test +++ b/t/chainlint/if-in-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'if-in-loop' ' ( for i in a b c do @@ -13,3 +14,4 @@ done bar ) +' diff --git a/t/chainlint/if-then-else.expect b/t/chainlint/if-then-else.expect index cbaaf857d4..965d7e41a2 100644 --- a/t/chainlint/if-then-else.expect +++ b/t/chainlint/if-then-else.expect @@ -1,22 +1,22 @@ -( - if test -n "" - then - echo very ?!AMP?! - echo empty - elif test -z "" - then - echo foo - else - echo foo && - cat <<-\EOF - bar - EOF - fi ?!AMP?! - echo poodle -) && -( - if test -n ""; then - echo very && - echo empty - fi -) +2 ( +3 if test -n "" +4 then +5 echo very ?!AMP?! +6 echo empty +7 elif test -z "" +8 then +9 echo foo +10 else +11 echo foo && +12 cat <<-\EOF +13 bar +14 EOF +15 fi ?!AMP?! +16 echo poodle +17 ) && +18 ( +19 if test -n ""; then +20 echo very && +21 echo empty +22 fi +23 ) diff --git a/t/chainlint/if-then-else.test b/t/chainlint/if-then-else.test index 2055336c2b..6582a7f440 100644 --- a/t/chainlint/if-then-else.test +++ b/t/chainlint/if-then-else.test @@ -1,3 +1,4 @@ +test_expect_success 'if-then-else' ' ( # LINT: "if", "then", "elif", "else", "fi" do not need "&&" if test -n "" @@ -27,3 +28,4 @@ echo empty fi ) +' diff --git a/t/chainlint/incomplete-line.expect b/t/chainlint/incomplete-line.expect index 134d3a14f5..b15e00b901 100644 --- a/t/chainlint/incomplete-line.expect +++ b/t/chainlint/incomplete-line.expect @@ -1,10 +1,10 @@ -line 1 \ -line 2 \ -line 3 \ -line 4 && -( - line 5 \ - line 6 \ - line 7 \ - line 8 -) +2 line 1 \ +3 line 2 \ +4 line 3 \ +5 line 4 && +6 ( +7 line 5 \ +8 line 6 \ +9 line 7 \ +10 line 8 +11 ) diff --git a/t/chainlint/incomplete-line.test b/t/chainlint/incomplete-line.test index d856658083..74a93021eb 100644 --- a/t/chainlint/incomplete-line.test +++ b/t/chainlint/incomplete-line.test @@ -1,3 +1,4 @@ +test_expect_success 'incomplete-line' ' # LINT: stitch together all incomplete \-ending lines line 1 \ line 2 \ @@ -10,3 +11,4 @@ line 4 && line 7 \ line 8 ) +' diff --git a/t/chainlint/inline-comment.expect b/t/chainlint/inline-comment.expect index 6bad218530..0285c0b22c 100644 --- a/t/chainlint/inline-comment.expect +++ b/t/chainlint/inline-comment.expect @@ -1,8 +1,8 @@ -( - foobar && # comment 1 - barfoo ?!AMP?! # wrong position for && - flibble "not a # comment" -) && - -(cd foo && - flibble "not a # comment") +2 ( +3 foobar && # comment 1 +4 barfoo ?!AMP?! # wrong position for && +5 flibble "not a # comment" +6 ) && +7 +8 (cd foo && +9 flibble "not a # comment") diff --git a/t/chainlint/inline-comment.test b/t/chainlint/inline-comment.test index 8f26856e77..4fbbf1058a 100644 --- a/t/chainlint/inline-comment.test +++ b/t/chainlint/inline-comment.test @@ -1,3 +1,4 @@ +test_expect_success 'inline-comment' ' ( # LINT: swallow inline comment (leaving command intact) foobar && # comment 1 @@ -10,3 +11,4 @@ # LINT: "#" in string in cuddled subshell not misinterpreted as comment (cd foo && flibble "not a # comment") +' diff --git a/t/chainlint/loop-detect-failure.expect b/t/chainlint/loop-detect-failure.expect index a66025c39d..40c06f0d53 100644 --- a/t/chainlint/loop-detect-failure.expect +++ b/t/chainlint/loop-detect-failure.expect @@ -1,15 +1,15 @@ -git init r1 && -for n in 1 2 3 4 5 -do - echo "This is file: $n" > r1/file.$n && - git -C r1 add file.$n && - git -C r1 commit -m "$n" || return 1 -done && - -git init r2 && -for n in 1000 10000 -do - printf "%"$n"s" X > r2/large.$n && - git -C r2 add large.$n && - git -C r2 commit -m "$n" ?!LOOP?! -done +2 git init r1 && +3 for n in 1 2 3 4 5 +4 do +5 echo "This is file: $n" > r1/file.$n && +6 git -C r1 add file.$n && +7 git -C r1 commit -m "$n" || return 1 +8 done && +9 +10 git init r2 && +11 for n in 1000 10000 +12 do +13 printf "%"$n"s" X > r2/large.$n && +14 git -C r2 add large.$n && +15 git -C r2 commit -m "$n" ?!LOOP?! +16 done diff --git a/t/chainlint/loop-detect-failure.test b/t/chainlint/loop-detect-failure.test index b9791cc802..44673aa394 100644 --- a/t/chainlint/loop-detect-failure.test +++ b/t/chainlint/loop-detect-failure.test @@ -1,3 +1,4 @@ +test_expect_success 'loop-detect-failure' ' git init r1 && # LINT: loop handles failure explicitly with "|| return 1" for n in 1 2 3 4 5 @@ -15,3 +16,4 @@ do git -C r2 add large.$n && git -C r2 commit -m "$n" done +' diff --git a/t/chainlint/loop-detect-status.expect b/t/chainlint/loop-detect-status.expect index 7ce3a34806..0f180b08de 100644 --- a/t/chainlint/loop-detect-status.expect +++ b/t/chainlint/loop-detect-status.expect @@ -1,18 +1,18 @@ -(while test $i -le $blobcount - do - printf "Generating blob $i/$blobcount\r" >&2 && - printf "blob\nmark :$i\ndata $blobsize\n" && - #test-tool genrandom $i $blobsize && - printf "%-${blobsize}s" $i && - echo "M 100644 :$i $i" >> commit && - i=$(($i+1)) || - echo $? > exit-status - done && - echo "commit refs/heads/main" && - echo "author A U Thor <author@email.com> 123456789 +0000" && - echo "committer C O Mitter <committer@email.com> 123456789 +0000" && - echo "data 5" && - echo ">2gb" && - cat commit) | -git fast-import --big-file-threshold=2 && -test ! -f exit-status +2 (while test $i -le $blobcount +3 do +4 printf "Generating blob $i/$blobcount\r" >&2 && +5 printf "blob\nmark :$i\ndata $blobsize\n" && +6 #test-tool genrandom $i $blobsize && +7 printf "%-${blobsize}s" $i && +8 echo "M 100644 :$i $i" >> commit && +9 i=$(($i+1)) || +10 echo $? > exit-status +11 done && +12 echo "commit refs/heads/main" && +13 echo "author A U Thor <author@email.com> 123456789 +0000" && +14 echo "committer C O Mitter <committer@email.com> 123456789 +0000" && +15 echo "data 5" && +16 echo ">2gb" && +17 cat commit) | +18 git fast-import --big-file-threshold=2 && +19 test ! -f exit-status diff --git a/t/chainlint/loop-detect-status.test b/t/chainlint/loop-detect-status.test index 1c6c23cfc9..8b639be073 100644 --- a/t/chainlint/loop-detect-status.test +++ b/t/chainlint/loop-detect-status.test @@ -1,3 +1,4 @@ +test_expect_success 'loop-detect-status' ' # LINT: "$?" handled explicitly within loop body (while test $i -le $blobcount do @@ -17,3 +18,4 @@ cat commit) | git fast-import --big-file-threshold=2 && test ! -f exit-status +' diff --git a/t/chainlint/loop-in-if.expect b/t/chainlint/loop-in-if.expect index 6c5d6e5b24..4e8c67c914 100644 --- a/t/chainlint/loop-in-if.expect +++ b/t/chainlint/loop-in-if.expect @@ -1,12 +1,12 @@ -( - if true - then - while true - do - echo "pop" ?!AMP?! - echo "glup" ?!LOOP?! - done ?!AMP?! - foo - fi ?!AMP?! - bar -) +2 ( +3 if true +4 then +5 while true +6 do +7 echo "pop" ?!AMP?! +8 echo "glup" ?!LOOP?! +9 done ?!AMP?! +10 foo +11 fi ?!AMP?! +12 bar +13 ) diff --git a/t/chainlint/loop-in-if.test b/t/chainlint/loop-in-if.test index dfcc3f98fb..b0d0d393cf 100644 --- a/t/chainlint/loop-in-if.test +++ b/t/chainlint/loop-in-if.test @@ -1,3 +1,4 @@ +test_expect_success 'loop-in-if' ' ( if true then @@ -13,3 +14,4 @@ fi bar ) +' diff --git a/t/chainlint/loop-upstream-pipe.expect b/t/chainlint/loop-upstream-pipe.expect index 0b82ecc4b9..bef82479ca 100644 --- a/t/chainlint/loop-upstream-pipe.expect +++ b/t/chainlint/loop-upstream-pipe.expect @@ -1,10 +1,10 @@ -( - git rev-list --objects --no-object-names base..loose | - while read oid - do - path="$objdir/$(test_oid_to_path "$oid")" && - printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" || - echo "object list generation failed for $oid" - done | - sort -k1 -) >expect && +2 ( +3 git rev-list --objects --no-object-names base..loose | +4 while read oid +5 do +6 path="$objdir/$(test_oid_to_path "$oid")" && +7 printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" || +8 echo "object list generation failed for $oid" +9 done | +10 sort -k1 +11 ) >expect && diff --git a/t/chainlint/loop-upstream-pipe.test b/t/chainlint/loop-upstream-pipe.test index efb77da897..8415a4db27 100644 --- a/t/chainlint/loop-upstream-pipe.test +++ b/t/chainlint/loop-upstream-pipe.test @@ -1,3 +1,4 @@ +test_expect_success 'loop-upstream-pipe' ' ( git rev-list --objects --no-object-names base..loose | while read oid @@ -9,3 +10,4 @@ done | sort -k1 ) >expect && +' diff --git a/t/chainlint/multi-line-nested-command-substitution.expect b/t/chainlint/multi-line-nested-command-substitution.expect index 300058341b..ad27e43e05 100644 --- a/t/chainlint/multi-line-nested-command-substitution.expect +++ b/t/chainlint/multi-line-nested-command-substitution.expect @@ -1,18 +1,18 @@ -( - foo && - x=$( - echo bar | - cat - ) && - echo ok -) | -sort && -( - bar && - x=$(echo bar | - cat - ) && - y=$(echo baz | - fip) && - echo fail -) +2 ( +3 foo && +4 x=$( +5 echo bar | +6 cat +7 ) && +8 echo ok +9 ) | +10 sort && +11 ( +12 bar && +13 x=$(echo bar | +14 cat +15 ) && +16 y=$(echo baz | +17 fip) && +18 echo fail +19 ) diff --git a/t/chainlint/multi-line-nested-command-substitution.test b/t/chainlint/multi-line-nested-command-substitution.test index 300058341b..e811c63f2b 100644 --- a/t/chainlint/multi-line-nested-command-substitution.test +++ b/t/chainlint/multi-line-nested-command-substitution.test @@ -1,3 +1,4 @@ +test_expect_success 'multi-line-nested-command-substitution' ' ( foo && x=$( @@ -16,3 +17,4 @@ sort && fip) && echo fail ) +' diff --git a/t/chainlint/multi-line-string.expect b/t/chainlint/multi-line-string.expect index 27ff95218e..62c54e3a5e 100644 --- a/t/chainlint/multi-line-string.expect +++ b/t/chainlint/multi-line-string.expect @@ -1,14 +1,14 @@ -( - x="line 1 - line 2 - line 3" && - y="line 1 - line2" ?!AMP?! - foobar -) && -( - echo "xyz" "abc - def - ghi" && - barfoo -) +2 ( +3 x="line 1 +4 line 2 +5 line 3" && +6 y="line 1 +7 line2" ?!AMP?! +8 foobar +9 ) && +10 ( +11 echo "xyz" "abc +12 def +13 ghi" && +14 barfoo +15 ) diff --git a/t/chainlint/multi-line-string.test b/t/chainlint/multi-line-string.test index 4a0af2107d..7b5048d2ea 100644 --- a/t/chainlint/multi-line-string.test +++ b/t/chainlint/multi-line-string.test @@ -1,3 +1,4 @@ +test_expect_success 'multi-line-string' ' ( x="line 1 line 2 @@ -13,3 +14,4 @@ ghi" && barfoo ) +' diff --git a/t/chainlint/negated-one-liner.expect b/t/chainlint/negated-one-liner.expect index ad4c2d949e..a6ce52a1da 100644 --- a/t/chainlint/negated-one-liner.expect +++ b/t/chainlint/negated-one-liner.expect @@ -1,5 +1,5 @@ -! (foo && bar) && -! (foo && bar) >baz && - -! (foo; ?!AMP?! bar) && -! (foo; ?!AMP?! bar) >baz +2 ! (foo && bar) && +3 ! (foo && bar) >baz && +4 +5 ! (foo; ?!AMP?! bar) && +6 ! (foo; ?!AMP?! bar) >baz diff --git a/t/chainlint/negated-one-liner.test b/t/chainlint/negated-one-liner.test index c9598e9153..30f4cc5a9b 100644 --- a/t/chainlint/negated-one-liner.test +++ b/t/chainlint/negated-one-liner.test @@ -1,3 +1,4 @@ +test_expect_success 'negated-one-liner' ' # LINT: top-level one-liner subshell ! (foo && bar) && ! (foo && bar) >baz && @@ -5,3 +6,4 @@ # LINT: top-level one-liner subshell missing internal "&&" ! (foo; bar) && ! (foo; bar) >baz +' diff --git a/t/chainlint/nested-cuddled-subshell.expect b/t/chainlint/nested-cuddled-subshell.expect index 3836049cc4..0191c9c294 100644 --- a/t/chainlint/nested-cuddled-subshell.expect +++ b/t/chainlint/nested-cuddled-subshell.expect @@ -1,25 +1,25 @@ -( - (cd foo && - bar - ) && - - (cd foo && - bar - ) ?!AMP?! - - ( - cd foo && - bar) && - - ( - cd foo && - bar) ?!AMP?! - - (cd foo && - bar) && - - (cd foo && - bar) ?!AMP?! - - foobar -) +2 ( +3 (cd foo && +4 bar +5 ) && +6 +7 (cd foo && +8 bar +9 ) ?!AMP?! +10 +11 ( +12 cd foo && +13 bar) && +14 +15 ( +16 cd foo && +17 bar) ?!AMP?! +18 +19 (cd foo && +20 bar) && +21 +22 (cd foo && +23 bar) ?!AMP?! +24 +25 foobar +26 ) diff --git a/t/chainlint/nested-cuddled-subshell.test b/t/chainlint/nested-cuddled-subshell.test index 8fd656c7b5..31e92d3be4 100644 --- a/t/chainlint/nested-cuddled-subshell.test +++ b/t/chainlint/nested-cuddled-subshell.test @@ -1,3 +1,4 @@ +test_expect_success 'nested-cuddled-subshell' ' ( # LINT: opening "(" cuddled with first nested subshell statement (cd foo && @@ -29,3 +30,4 @@ foobar ) +' diff --git a/t/chainlint/nested-here-doc.expect b/t/chainlint/nested-here-doc.expect index 29b3832a98..70d9b68dc9 100644 --- a/t/chainlint/nested-here-doc.expect +++ b/t/chainlint/nested-here-doc.expect @@ -1,30 +1,30 @@ -cat <<ARBITRARY >foop && -naddle -fub <<EOF - nozzle - noodle -EOF -formp -ARBITRARY - -( - cat <<-\INPUT_END && - fish are mice - but geese go slow - data <<EOF - perl is lerp - and nothing else - EOF - toink - INPUT_END - - cat <<-\EOT ?!AMP?! - text goes here - data <<EOF - data goes here - EOF - more test here - EOT - - foobar -) +2 cat <<ARBITRARY >foop && +3 naddle +4 fub <<EOF +5 nozzle +6 noodle +7 EOF +8 formp +9 ARBITRARY +10 +11 ( +12 cat <<-\INPUT_END && +13 fish are mice +14 but geese go slow +15 data <<EOF +16 perl is lerp +17 and nothing else +18 EOF +19 toink +20 INPUT_END +21 +22 cat <<-\EOT ?!AMP?! +23 text goes here +24 data <<EOF +25 data goes here +26 EOF +27 more test here +28 EOT +29 +30 foobar +31 ) diff --git a/t/chainlint/nested-here-doc.test b/t/chainlint/nested-here-doc.test index f35404bf0f..9505c47a34 100644 --- a/t/chainlint/nested-here-doc.test +++ b/t/chainlint/nested-here-doc.test @@ -1,3 +1,4 @@ +test_expect_success 'nested-here-doc' ' # LINT: inner "EOF" not misintrepreted as closing ARBITRARY here-doc cat <<ARBITRARY >foop && naddle @@ -31,3 +32,4 @@ ARBITRARY foobar ) +' diff --git a/t/chainlint/nested-loop-detect-failure.expect b/t/chainlint/nested-loop-detect-failure.expect index 3461df40e5..c13c4d2f90 100644 --- a/t/chainlint/nested-loop-detect-failure.expect +++ b/t/chainlint/nested-loop-detect-failure.expect @@ -1,31 +1,31 @@ -for i in 0 1 2 3 4 5 6 7 8 9; -do - for j in 0 1 2 3 4 5 6 7 8 9; - do - echo "$i$j" >"path$i$j" ?!LOOP?! - done ?!LOOP?! -done && - -for i in 0 1 2 3 4 5 6 7 8 9; -do - for j in 0 1 2 3 4 5 6 7 8 9; - do - echo "$i$j" >"path$i$j" || return 1 - done -done && - -for i in 0 1 2 3 4 5 6 7 8 9; -do - for j in 0 1 2 3 4 5 6 7 8 9; - do - echo "$i$j" >"path$i$j" ?!LOOP?! - done || return 1 -done && - -for i in 0 1 2 3 4 5 6 7 8 9; -do - for j in 0 1 2 3 4 5 6 7 8 9; - do - echo "$i$j" >"path$i$j" || return 1 - done || return 1 -done +2 for i in 0 1 2 3 4 5 6 7 8 9; +3 do +4 for j in 0 1 2 3 4 5 6 7 8 9; +5 do +6 echo "$i$j" >"path$i$j" ?!LOOP?! +7 done ?!LOOP?! +8 done && +9 +10 for i in 0 1 2 3 4 5 6 7 8 9; +11 do +12 for j in 0 1 2 3 4 5 6 7 8 9; +13 do +14 echo "$i$j" >"path$i$j" || return 1 +15 done +16 done && +17 +18 for i in 0 1 2 3 4 5 6 7 8 9; +19 do +20 for j in 0 1 2 3 4 5 6 7 8 9; +21 do +22 echo "$i$j" >"path$i$j" ?!LOOP?! +23 done || return 1 +24 done && +25 +26 for i in 0 1 2 3 4 5 6 7 8 9; +27 do +28 for j in 0 1 2 3 4 5 6 7 8 9; +29 do +30 echo "$i$j" >"path$i$j" || return 1 +31 done || return 1 +32 done diff --git a/t/chainlint/nested-loop-detect-failure.test b/t/chainlint/nested-loop-detect-failure.test index e6f0c1acfb..3d4b657412 100644 --- a/t/chainlint/nested-loop-detect-failure.test +++ b/t/chainlint/nested-loop-detect-failure.test @@ -1,3 +1,4 @@ +test_expect_success 'nested-loop-detect-failure' ' # LINT: neither loop handles failure explicitly with "|| return 1" for i in 0 1 2 3 4 5 6 7 8 9; do @@ -33,3 +34,4 @@ do echo "$i$j" >"path$i$j" || return 1 done || return 1 done +' diff --git a/t/chainlint/nested-subshell-comment.expect b/t/chainlint/nested-subshell-comment.expect index 9138cf386d..f89a8d03a8 100644 --- a/t/chainlint/nested-subshell-comment.expect +++ b/t/chainlint/nested-subshell-comment.expect @@ -1,11 +1,11 @@ -( - foo && - ( - bar && - # bottles wobble while fiddles gobble - # minor numbers of cows (or do they?) - baz && - snaff - ) ?!AMP?! - fuzzy -) +2 ( +3 foo && +4 ( +5 bar && +6 # bottles wobble while fiddles gobble +7 # minor numbers of cows (or do they?) +8 baz && +9 snaff +10 ) ?!AMP?! +11 fuzzy +12 ) diff --git a/t/chainlint/nested-subshell-comment.test b/t/chainlint/nested-subshell-comment.test index 0215cdb192..b430580ce0 100644 --- a/t/chainlint/nested-subshell-comment.test +++ b/t/chainlint/nested-subshell-comment.test @@ -1,3 +1,4 @@ +test_expect_success 'nested-subshell-comment' ' ( foo && ( @@ -11,3 +12,4 @@ ) fuzzy ) +' diff --git a/t/chainlint/nested-subshell.expect b/t/chainlint/nested-subshell.expect index 73ff28546a..811e8a7912 100644 --- a/t/chainlint/nested-subshell.expect +++ b/t/chainlint/nested-subshell.expect @@ -1,13 +1,13 @@ -( - cd foo && - ( - echo a && - echo b - ) >file && - - cd foo && - ( - echo a ?!AMP?! - echo b - ) >file -) +2 ( +3 cd foo && +4 ( +5 echo a && +6 echo b +7 ) >file && +8 +9 cd foo && +10 ( +11 echo a ?!AMP?! +12 echo b +13 ) >file +14 ) diff --git a/t/chainlint/nested-subshell.test b/t/chainlint/nested-subshell.test index 440ee9992d..c31da34b73 100644 --- a/t/chainlint/nested-subshell.test +++ b/t/chainlint/nested-subshell.test @@ -1,3 +1,4 @@ +test_expect_success 'nested-subshell' ' ( cd foo && ( @@ -11,3 +12,4 @@ echo b ) >file ) +' diff --git a/t/chainlint/not-heredoc.expect b/t/chainlint/not-heredoc.expect index 2e9bb135fe..611b7b75cb 100644 --- a/t/chainlint/not-heredoc.expect +++ b/t/chainlint/not-heredoc.expect @@ -1,14 +1,14 @@ -echo "<<<<<<< ours" && -echo ourside && -echo "=======" && -echo theirside && -echo ">>>>>>> theirs" && - -( - echo "<<<<<<< ours" && - echo ourside && - echo "=======" && - echo theirside && - echo ">>>>>>> theirs" ?!AMP?! - poodle -) >merged +2 echo "<<<<<<< ours" && +3 echo ourside && +4 echo "=======" && +5 echo theirside && +6 echo ">>>>>>> theirs" && +7 +8 ( +9 echo "<<<<<<< ours" && +10 echo ourside && +11 echo "=======" && +12 echo theirside && +13 echo ">>>>>>> theirs" ?!AMP?! +14 poodle +15 ) >merged diff --git a/t/chainlint/not-heredoc.test b/t/chainlint/not-heredoc.test index 9aa57346cd..09711e45e0 100644 --- a/t/chainlint/not-heredoc.test +++ b/t/chainlint/not-heredoc.test @@ -1,3 +1,4 @@ +test_expect_success 'not-heredoc' ' # LINT: "<< ours" inside string is not here-doc echo "<<<<<<< ours" && echo ourside && @@ -14,3 +15,4 @@ echo ">>>>>>> theirs" && echo ">>>>>>> theirs" poodle ) >merged +' diff --git a/t/chainlint/one-liner-for-loop.expect b/t/chainlint/one-liner-for-loop.expect index 51a3dc7c54..49dcf065ef 100644 --- a/t/chainlint/one-liner-for-loop.expect +++ b/t/chainlint/one-liner-for-loop.expect @@ -1,9 +1,9 @@ -git init dir-rename-and-content && -( - cd dir-rename-and-content && - test_write_lines 1 2 3 4 5 >foo && - mkdir olddir && - for i in a b c; do echo $i >olddir/$i; ?!LOOP?! done ?!AMP?! - git add foo olddir && - git commit -m "original" && -) +2 git init dir-rename-and-content && +3 ( +4 cd dir-rename-and-content && +5 test_write_lines 1 2 3 4 5 >foo && +6 mkdir olddir && +7 for i in a b c; do echo $i >olddir/$i; ?!LOOP?! done ?!AMP?! +8 git add foo olddir && +9 git commit -m "original" && +10 ) diff --git a/t/chainlint/one-liner-for-loop.test b/t/chainlint/one-liner-for-loop.test index 4bd8c066c7..00afd7ef76 100644 --- a/t/chainlint/one-liner-for-loop.test +++ b/t/chainlint/one-liner-for-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'one-liner-for-loop' ' git init dir-rename-and-content && ( cd dir-rename-and-content && @@ -8,3 +9,4 @@ git init dir-rename-and-content && git add foo olddir && git commit -m "original" && ) +' diff --git a/t/chainlint/one-liner.expect b/t/chainlint/one-liner.expect index 57a7a444c1..9861811283 100644 --- a/t/chainlint/one-liner.expect +++ b/t/chainlint/one-liner.expect @@ -1,9 +1,9 @@ -(foo && bar) && -(foo && bar) | -(foo && bar) >baz && - -(foo; ?!AMP?! bar) && -(foo; ?!AMP?! bar) | -(foo; ?!AMP?! bar) >baz && - -(foo "bar; baz") +2 (foo && bar) && +3 (foo && bar) | +4 (foo && bar) >baz && +5 +6 (foo; ?!AMP?! bar) && +7 (foo; ?!AMP?! bar) | +8 (foo; ?!AMP?! bar) >baz && +9 +10 (foo "bar; baz") diff --git a/t/chainlint/one-liner.test b/t/chainlint/one-liner.test index be9858fa29..6e42ee1b5e 100644 --- a/t/chainlint/one-liner.test +++ b/t/chainlint/one-liner.test @@ -1,3 +1,4 @@ +test_expect_success 'one-liner' ' # LINT: top-level one-liner subshell (foo && bar) && (foo && bar) | @@ -10,3 +11,4 @@ # LINT: ";" in string not misinterpreted as broken &&-chain (foo "bar; baz") +' diff --git a/t/chainlint/p4-filespec.expect b/t/chainlint/p4-filespec.expect index 1290fd1ff2..cff3e4e3d1 100644 --- a/t/chainlint/p4-filespec.expect +++ b/t/chainlint/p4-filespec.expect @@ -1,4 +1,4 @@ -( - p4 print -1 //depot/fiddle#42 >file && - foobar -) +2 ( +3 p4 print -1 //depot/fiddle#42 >file && +4 foobar +5 ) diff --git a/t/chainlint/p4-filespec.test b/t/chainlint/p4-filespec.test index 4fd2d6e2b8..8ba6b911dc 100644 --- a/t/chainlint/p4-filespec.test +++ b/t/chainlint/p4-filespec.test @@ -1,5 +1,7 @@ +test_expect_success 'p4-filespec' ' ( # LINT: Perforce revspec in filespec not misinterpreted as in-line comment p4 print -1 //depot/fiddle#42 >file && foobar ) +' diff --git a/t/chainlint/pipe.expect b/t/chainlint/pipe.expect index 811971b1a3..1bbe5a2ce1 100644 --- a/t/chainlint/pipe.expect +++ b/t/chainlint/pipe.expect @@ -1,10 +1,10 @@ -( - foo | - bar | - baz && - - fish | - cow ?!AMP?! - - sunder -) +2 ( +3 foo | +4 bar | +5 baz && +6 +7 fish | +8 cow ?!AMP?! +9 +10 sunder +11 ) diff --git a/t/chainlint/pipe.test b/t/chainlint/pipe.test index dd82534c66..1af81c243b 100644 --- a/t/chainlint/pipe.test +++ b/t/chainlint/pipe.test @@ -1,3 +1,4 @@ +test_expect_success 'pipe' ' ( # LINT: no "&&" needed on line ending with "|" foo | @@ -10,3 +11,4 @@ sunder ) +' diff --git a/t/chainlint/return-loop.expect b/t/chainlint/return-loop.expect index cfc0549bef..da8f9abea3 100644 --- a/t/chainlint/return-loop.expect +++ b/t/chainlint/return-loop.expect @@ -1,5 +1,5 @@ -while test $i -lt $((num - 5)) -do - git notes add -m "notes for commit$i" HEAD~$i || return 1 - i=$((i + 1)) -done +2 while test $i -lt $((num - 5)) +3 do +4 git notes add -m "notes for commit$i" HEAD~$i || return 1 +5 i=$((i + 1)) +6 done diff --git a/t/chainlint/return-loop.test b/t/chainlint/return-loop.test index f90b171300..ea76c3593a 100644 --- a/t/chainlint/return-loop.test +++ b/t/chainlint/return-loop.test @@ -1,6 +1,8 @@ +test_expect_success 'return-loop' ' while test $i -lt $((num - 5)) do # LINT: "|| return {n}" valid loop escape outside subshell; no "&&" needed git notes add -m "notes for commit$i" HEAD~$i || return 1 i=$((i + 1)) done +' diff --git a/t/chainlint/semicolon.expect b/t/chainlint/semicolon.expect index 3aa2259f36..866438310c 100644 --- a/t/chainlint/semicolon.expect +++ b/t/chainlint/semicolon.expect @@ -1,19 +1,19 @@ -( - cat foo ; ?!AMP?! echo bar ?!AMP?! - cat foo ; ?!AMP?! echo bar -) && -( - cat foo ; ?!AMP?! echo bar && - cat foo ; ?!AMP?! echo bar -) && -( - echo "foo; bar" && - cat foo; ?!AMP?! echo bar -) && -( - foo; -) && -(cd foo && - for i in a b c; do - echo; ?!LOOP?! - done) +2 ( +3 cat foo ; ?!AMP?! echo bar ?!AMP?! +4 cat foo ; ?!AMP?! echo bar +5 ) && +6 ( +7 cat foo ; ?!AMP?! echo bar && +8 cat foo ; ?!AMP?! echo bar +9 ) && +10 ( +11 echo "foo; bar" && +12 cat foo; ?!AMP?! echo bar +13 ) && +14 ( +15 foo; +16 ) && +17 (cd foo && +18 for i in a b c; do +19 echo; ?!LOOP?! +20 done) diff --git a/t/chainlint/semicolon.test b/t/chainlint/semicolon.test index 67e1192c50..fc0ba1b539 100644 --- a/t/chainlint/semicolon.test +++ b/t/chainlint/semicolon.test @@ -1,3 +1,4 @@ +test_expect_success 'semicolon' ' ( # LINT: missing internal "&&" and ending "&&" cat foo ; echo bar @@ -23,3 +24,4 @@ # LINT: semicolon unnecessary but legitimate echo; done) +' diff --git a/t/chainlint/sqstring-in-sqstring.expect b/t/chainlint/sqstring-in-sqstring.expect index cf0b591cf7..ba5d3c3a6d 100644 --- a/t/chainlint/sqstring-in-sqstring.expect +++ b/t/chainlint/sqstring-in-sqstring.expect @@ -1,4 +1,4 @@ -perl -e ' - defined($_ = -s $_) or die for @ARGV; - exit 1 if $ARGV[0] <= $ARGV[1]; -' test-2-$packname_2.pack test-3-$packname_3.pack +2 perl -e ' +3 defined($_ = -s $_) or die for @ARGV; +4 exit 1 if $ARGV[0] <= $ARGV[1]; +5 ' test-2-$packname_2.pack test-3-$packname_3.pack diff --git a/t/chainlint/sqstring-in-sqstring.test b/t/chainlint/sqstring-in-sqstring.test index 77a425e0c7..24169724a5 100644 --- a/t/chainlint/sqstring-in-sqstring.test +++ b/t/chainlint/sqstring-in-sqstring.test @@ -1,5 +1,7 @@ +test_expect_success 'sqstring-in-sqstring' ' # LINT: SQ-string Perl code fragment within SQ-string perl -e '\'' defined($_ = -s $_) or die for @ARGV; exit 1 if $ARGV[0] <= $ARGV[1]; '\'' test-2-$packname_2.pack test-3-$packname_3.pack +' diff --git a/t/chainlint/subshell-here-doc.expect b/t/chainlint/subshell-here-doc.expect index 75d6f607e2..5647500c82 100644 --- a/t/chainlint/subshell-here-doc.expect +++ b/t/chainlint/subshell-here-doc.expect @@ -1,30 +1,30 @@ -( - echo wobba \ - gorgo snoot \ - wafta snurb <<-EOF && - quoth the raven, - nevermore... - EOF - - cat <<EOF >bip ?!AMP?! - fish fly high -EOF - - echo <<-\EOF >bop - gomez - morticia - wednesday - pugsly - EOF -) && -( - cat <<-\ARBITRARY >bup && - glink - FIZZ - ARBITRARY - cat <<-"ARBITRARY3" >bup3 && - glink - FIZZ - ARBITRARY3 - meep -) +2 ( +3 echo wobba \ +4 gorgo snoot \ +5 wafta snurb <<-EOF && +6 quoth the raven, +7 nevermore... +8 EOF +9 +10 cat <<EOF >bip ?!AMP?! +11 fish fly high +12 EOF +13 +14 echo <<-\EOF >bop +15 gomez +16 morticia +17 wednesday +18 pugsly +19 EOF +20 ) && +21 ( +22 cat <<-\ARBITRARY >bup && +23 glink +24 FIZZ +25 ARBITRARY +26 cat <<-"ARBITRARY3" >bup3 && +27 glink +28 FIZZ +29 ARBITRARY3 +30 meep +31 ) diff --git a/t/chainlint/subshell-here-doc.test b/t/chainlint/subshell-here-doc.test index d40eb65583..4a38f47f01 100644 --- a/t/chainlint/subshell-here-doc.test +++ b/t/chainlint/subshell-here-doc.test @@ -1,3 +1,4 @@ +test_expect_success 'subshell-here-doc' ' ( # LINT: stitch together incomplete \-ending lines # LINT: swallow here-doc to avoid false positives in content @@ -33,3 +34,4 @@ EOF ARBITRARY3 meep ) +' diff --git a/t/chainlint/subshell-one-liner.expect b/t/chainlint/subshell-one-liner.expect index 8f694990e8..214316c6a0 100644 --- a/t/chainlint/subshell-one-liner.expect +++ b/t/chainlint/subshell-one-liner.expect @@ -1,19 +1,19 @@ -( - (foo && bar) && - (foo && bar) | - (foo && bar) >baz && - - (foo; ?!AMP?! bar) && - (foo; ?!AMP?! bar) | - (foo; ?!AMP?! bar) >baz && - - (foo || exit 1) && - (foo || exit 1) | - (foo || exit 1) >baz && - - (foo && bar) ?!AMP?! - - (foo && bar; ?!AMP?! baz) ?!AMP?! - - foobar -) +2 ( +3 (foo && bar) && +4 (foo && bar) | +5 (foo && bar) >baz && +6 +7 (foo; ?!AMP?! bar) && +8 (foo; ?!AMP?! bar) | +9 (foo; ?!AMP?! bar) >baz && +10 +11 (foo || exit 1) && +12 (foo || exit 1) | +13 (foo || exit 1) >baz && +14 +15 (foo && bar) ?!AMP?! +16 +17 (foo && bar; ?!AMP?! baz) ?!AMP?! +18 +19 foobar +20 ) diff --git a/t/chainlint/subshell-one-liner.test b/t/chainlint/subshell-one-liner.test index 37fa643c20..dac536afcc 100644 --- a/t/chainlint/subshell-one-liner.test +++ b/t/chainlint/subshell-one-liner.test @@ -1,3 +1,4 @@ +test_expect_success 'subshell-one-liner' ' ( # LINT: nested one-liner subshell (foo && bar) && @@ -22,3 +23,4 @@ foobar ) +' diff --git a/t/chainlint/t7900-subtree.expect b/t/chainlint/t7900-subtree.expect index 02f3129232..9e60338bcf 100644 --- a/t/chainlint/t7900-subtree.expect +++ b/t/chainlint/t7900-subtree.expect @@ -1,22 +1,22 @@ -( - chks="sub1 -sub2 -sub3 -sub4" && - chks_sub=$(cat <<TXT | sed "s,^,sub dir/," -$chks -TXT -) && - chkms="main-sub1 -main-sub2 -main-sub3 -main-sub4" && - chkms_sub=$(cat <<TXT | sed "s,^,sub dir/," -$chkms -TXT -) && - - subfiles=$(git ls-files) && - check_equal "$subfiles" "$chkms -$chks" -) +2 ( +3 chks="sub1 +4 sub2 +5 sub3 +6 sub4" && +7 chks_sub=$(cat <<TXT | sed "s,^,sub dir/," +8 $chks +9 TXT +10 ) && +11 chkms="main-sub1 +12 main-sub2 +13 main-sub3 +14 main-sub4" && +15 chkms_sub=$(cat <<TXT | sed "s,^,sub dir/," +16 $chkms +17 TXT +18 ) && +19 +20 subfiles=$(git ls-files) && +21 check_equal "$subfiles" "$chkms +22 $chks" +23 ) diff --git a/t/chainlint/t7900-subtree.test b/t/chainlint/t7900-subtree.test index 02f3129232..1f4f03300f 100644 --- a/t/chainlint/t7900-subtree.test +++ b/t/chainlint/t7900-subtree.test @@ -1,3 +1,4 @@ +test_expect_success 't7900-subtree' ' ( chks="sub1 sub2 @@ -20,3 +21,4 @@ TXT check_equal "$subfiles" "$chkms $chks" ) +' diff --git a/t/chainlint/token-pasting.expect b/t/chainlint/token-pasting.expect index 6a387917a7..64f3235d26 100644 --- a/t/chainlint/token-pasting.expect +++ b/t/chainlint/token-pasting.expect @@ -1,27 +1,27 @@ -git config filter.rot13.smudge ./rot13.sh && -git config filter.rot13.clean ./rot13.sh && - -{ - echo "*.t filter=rot13" ?!AMP?! - echo "*.i ident" -} >.gitattributes && - -{ - echo a b c d e f g h i j k l m ?!AMP?! - echo n o p q r s t u v w x y z ?!AMP?! - echo '$Id$' -} >test && -cat test >test.t && -cat test >test.o && -cat test >test.i && -git add test test.t test.i && -rm -f test test.t test.i && -git checkout -- test test.t test.i && - -echo "content-test2" >test2.o && -echo "content-test3 - filename with special characters" >"test3 'sq',$x=.o" ?!AMP?! - -downstream_url_for_sed=$( - printf "%sn" "$downstream_url" | - sed -e 's/\/\\/g' -e 's/[[/.*^$]/\&/g' -) +2 git config filter.rot13.smudge ./rot13.sh && +3 git config filter.rot13.clean ./rot13.sh && +4 +5 { +6 echo "*.t filter=rot13" ?!AMP?! +7 echo "*.i ident" +8 } >.gitattributes && +9 +10 { +11 echo a b c d e f g h i j k l m ?!AMP?! +12 echo n o p q r s t u v w x y z ?!AMP?! +13 echo '$Id$' +14 } >test && +15 cat test >test.t && +16 cat test >test.o && +17 cat test >test.i && +18 git add test test.t test.i && +19 rm -f test test.t test.i && +20 git checkout -- test test.t test.i && +21 +22 echo "content-test2" >test2.o && +23 echo "content-test3 - filename with special characters" >"test3 'sq',$x=.o" ?!AMP?! +24 +25 downstream_url_for_sed=$( +26 printf "%sn" "$downstream_url" | +27 sed -e 's/\/\\/g' -e 's/[[/.*^$]/\&/g' +28 ) diff --git a/t/chainlint/token-pasting.test b/t/chainlint/token-pasting.test index b4610ce815..590914b733 100644 --- a/t/chainlint/token-pasting.test +++ b/t/chainlint/token-pasting.test @@ -1,3 +1,4 @@ +test_expect_success 'token-pasting' ' # LINT: single token; composite of multiple strings git config filter.rot13.smudge ./rot13.sh && git config filter.rot13.clean ./rot13.sh && @@ -30,3 +31,4 @@ downstream_url_for_sed=$( # LINT: exit/enter string context; "&" inside string not command terminator sed -e '\''s/\\/\\\\/g'\'' -e '\''s/[[/.*^$]/\\&/g'\'' ) +' diff --git a/t/chainlint/unclosed-here-doc-indent.expect b/t/chainlint/unclosed-here-doc-indent.expect index 7c30a1a024..f78e23cb63 100644 --- a/t/chainlint/unclosed-here-doc-indent.expect +++ b/t/chainlint/unclosed-here-doc-indent.expect @@ -1,4 +1,4 @@ -command_which_is_run && -cat >expect <<-\EOF ?!UNCLOSED-HEREDOC?! && -we forget to end the here-doc -command_which_is_gobbled +2 command_which_is_run && +3 cat >expect <<-\EOF ?!UNCLOSED-HEREDOC?! && +4 we forget to end the here-doc +5 command_which_is_gobbled diff --git a/t/chainlint/unclosed-here-doc-indent.test b/t/chainlint/unclosed-here-doc-indent.test index 5c841a9dfd..7ac9d0f7d7 100644 --- a/t/chainlint/unclosed-here-doc-indent.test +++ b/t/chainlint/unclosed-here-doc-indent.test @@ -1,4 +1,6 @@ +test_expect_success 'unclosed-here-doc-indent' ' command_which_is_run && cat >expect <<-\EOF && we forget to end the here-doc command_which_is_gobbled +' diff --git a/t/chainlint/unclosed-here-doc.expect b/t/chainlint/unclosed-here-doc.expect index d65e50f78d..51304672cf 100644 --- a/t/chainlint/unclosed-here-doc.expect +++ b/t/chainlint/unclosed-here-doc.expect @@ -1,7 +1,7 @@ -command_which_is_run && -cat >expect <<\EOF ?!UNCLOSED-HEREDOC?! && - we try to end the here-doc below, - but the indentation throws us off - since the operator is not "<<-". - EOF -command_which_is_gobbled +2 command_which_is_run && +3 cat >expect <<\EOF ?!UNCLOSED-HEREDOC?! && +4 we try to end the here-doc below, +5 but the indentation throws us off +6 since the operator is not "<<-". +7 EOF +8 command_which_is_gobbled diff --git a/t/chainlint/unclosed-here-doc.test b/t/chainlint/unclosed-here-doc.test index 69d3786c34..68e78f06f3 100644 --- a/t/chainlint/unclosed-here-doc.test +++ b/t/chainlint/unclosed-here-doc.test @@ -1,3 +1,4 @@ +test_expect_success 'unclosed-here-doc' ' command_which_is_run && cat >expect <<\EOF && we try to end the here-doc below, @@ -5,3 +6,4 @@ cat >expect <<\EOF && since the operator is not "<<-". EOF command_which_is_gobbled +' diff --git a/t/chainlint/while-loop.expect b/t/chainlint/while-loop.expect index 06c1567f48..5ffabd5a93 100644 --- a/t/chainlint/while-loop.expect +++ b/t/chainlint/while-loop.expect @@ -1,14 +1,14 @@ -( - while true - do - echo foo ?!AMP?! - cat <<-\EOF ?!LOOP?! - bar - EOF - done ?!AMP?! - - while true; do - echo foo && - cat bar ?!LOOP?! - done -) +2 ( +3 while true +4 do +5 echo foo ?!AMP?! +6 cat <<-\EOF ?!LOOP?! +7 bar +8 EOF +9 done ?!AMP?! +10 +11 while true; do +12 echo foo && +13 cat bar ?!LOOP?! +14 done +15 ) diff --git a/t/chainlint/while-loop.test b/t/chainlint/while-loop.test index d09fb016e4..33a201906a 100644 --- a/t/chainlint/while-loop.test +++ b/t/chainlint/while-loop.test @@ -1,3 +1,4 @@ +test_expect_success 'while-loop' ' ( # LINT: "while", "do", "done" do not need "&&" while true @@ -17,3 +18,4 @@ cat bar done ) +' diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c deleted file mode 100644 index c03cfa5ecf..0000000000 --- a/t/helper/test-oidmap.c +++ /dev/null @@ -1,125 +0,0 @@ -#define USE_THE_REPOSITORY_VARIABLE - -#include "test-tool.h" -#include "hex.h" -#include "object-name.h" -#include "oidmap.h" -#include "repository.h" -#include "setup.h" -#include "strbuf.h" -#include "string-list.h" - -/* key is an oid and value is a name (could be a refname for example) */ -struct test_entry { - struct oidmap_entry entry; - char name[FLEX_ARRAY]; -}; - -#define DELIM " \t\r\n" - -/* - * Read stdin line by line and print result of commands to stdout: - * - * hash oidkey -> sha1hash(oidkey) - * put oidkey namevalue -> NULL / old namevalue - * get oidkey -> NULL / namevalue - * remove oidkey -> NULL / old namevalue - * iterate -> oidkey1 namevalue1\noidkey2 namevalue2\n... - * - */ -int cmd__oidmap(int argc UNUSED, const char **argv UNUSED) -{ - struct string_list parts = STRING_LIST_INIT_NODUP; - struct strbuf line = STRBUF_INIT; - struct oidmap map = OIDMAP_INIT; - - setup_git_directory(); - - /* init oidmap */ - oidmap_init(&map, 0); - - /* process commands from stdin */ - while (strbuf_getline(&line, stdin) != EOF) { - char *cmd, *p1, *p2; - struct test_entry *entry; - struct object_id oid; - - /* break line into command and up to two parameters */ - string_list_setlen(&parts, 0); - string_list_split_in_place(&parts, line.buf, DELIM, 2); - string_list_remove_empty_items(&parts, 0); - - /* ignore empty lines */ - if (!parts.nr) - continue; - if (!*parts.items[0].string || *parts.items[0].string == '#') - continue; - - cmd = parts.items[0].string; - p1 = parts.nr >= 1 ? parts.items[1].string : NULL; - p2 = parts.nr >= 2 ? parts.items[2].string : NULL; - - if (!strcmp("put", cmd) && p1 && p2) { - - if (repo_get_oid(the_repository, p1, &oid)) { - printf("Unknown oid: %s\n", p1); - continue; - } - - /* create entry with oid_key = p1, name_value = p2 */ - FLEX_ALLOC_STR(entry, name, p2); - oidcpy(&entry->entry.oid, &oid); - - /* add / replace entry */ - entry = oidmap_put(&map, entry); - - /* print and free replaced entry, if any */ - puts(entry ? entry->name : "NULL"); - free(entry); - - } else if (!strcmp("get", cmd) && p1) { - - if (repo_get_oid(the_repository, p1, &oid)) { - printf("Unknown oid: %s\n", p1); - continue; - } - - /* lookup entry in oidmap */ - entry = oidmap_get(&map, &oid); - - /* print result */ - puts(entry ? entry->name : "NULL"); - - } else if (!strcmp("remove", cmd) && p1) { - - if (repo_get_oid(the_repository, p1, &oid)) { - printf("Unknown oid: %s\n", p1); - continue; - } - - /* remove entry from oidmap */ - entry = oidmap_remove(&map, &oid); - - /* print result and free entry*/ - puts(entry ? entry->name : "NULL"); - free(entry); - - } else if (!strcmp("iterate", cmd)) { - - struct oidmap_iter iter; - oidmap_iter_init(&map, &iter); - while ((entry = oidmap_iter_next(&iter))) - printf("%s %s\n", oid_to_hex(&entry->entry.oid), entry->name); - - } else { - - printf("Unknown command %s\n", cmd); - - } - } - - string_list_clear(&parts, 0); - strbuf_release(&line); - oidmap_free(&map, 1); - return 0; -} diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c index 9160bc5da6..9d378427da 100644 --- a/t/helper/test-reftable.c +++ b/t/helper/test-reftable.c @@ -5,12 +5,10 @@ int cmd__reftable(int argc, const char **argv) { /* test from simple to complex. */ - record_test_main(argc, argv); block_test_main(argc, argv); tree_test_main(argc, argv); pq_test_main(argc, argv); readwrite_test_main(argc, argv); - merged_test_main(argc, argv); stack_test_main(argc, argv); return 0; } diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index 93436a82ae..da3e69128a 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -44,7 +44,6 @@ static struct test_cmd cmds[] = { { "mergesort", cmd__mergesort }, { "mktemp", cmd__mktemp }, { "oid-array", cmd__oid_array }, - { "oidmap", cmd__oidmap }, { "online-cpus", cmd__online_cpus }, { "pack-mtimes", cmd__pack_mtimes }, { "parse-options", cmd__parse_options }, diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index d9033d14e1..642a34578c 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -37,7 +37,6 @@ int cmd__lazy_init_name_hash(int argc, const char **argv); int cmd__match_trees(int argc, const char **argv); int cmd__mergesort(int argc, const char **argv); int cmd__mktemp(int argc, const char **argv); -int cmd__oidmap(int argc, const char **argv); int cmd__online_cpus(int argc, const char **argv); int cmd__pack_mtimes(int argc, const char **argv); int cmd__parse_options(int argc, const char **argv); diff --git a/t/lib-bundle-uri-protocol.sh b/t/lib-bundle-uri-protocol.sh index a4a1af8d02..de09b6b02e 100644 --- a/t/lib-bundle-uri-protocol.sh +++ b/t/lib-bundle-uri-protocol.sh @@ -18,7 +18,7 @@ git) start_git_daemon --export-all --enable=receive-pack BUNDLE_URI_PARENT="$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent" BUNDLE_URI_REPO_URI="$GIT_DAEMON_URL/parent" - BUNDLE_URI_BUNDLE_URI="https://example.com/fake.bdl" + BUNDLE_URI_BUNDLE_URI="$BUNDLE_URI_REPO_URI/fake.bdl" test_set_prereq BUNDLE_URI_GIT ;; http) @@ -26,7 +26,7 @@ http) start_httpd BUNDLE_URI_PARENT="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" BUNDLE_URI_REPO_URI="$HTTPD_URL/smart/http_parent" - BUNDLE_URI_BUNDLE_URI="https://example.com/fake.bdl" + BUNDLE_URI_BUNDLE_URI="$BUNDLE_URI_REPO_URL/fake.bdl" test_set_prereq BUNDLE_URI_HTTP ;; *) diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh index ff4fd9348c..9fc5882387 100755 --- a/t/t0007-git-var.sh +++ b/t/t0007-git-var.sh @@ -157,7 +157,7 @@ test_expect_success POSIXPERM 'GIT_SHELL_PATH points to a valid executable' ' test_expect_success MINGW 'GIT_SHELL_PATH points to a suitable shell' ' shellpath=$(git var GIT_SHELL_PATH) && case "$shellpath" in - *sh) ;; + [A-Z]:/*/sh.exe) test -f "$shellpath";; *) return 1;; esac ' diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh deleted file mode 100755 index 0faef1f4f1..0000000000 --- a/t/t0016-oidmap.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -test_description='test oidmap' - -TEST_PASSES_SANITIZE_LEAK=true -. ./test-lib.sh - -# This purposefully is very similar to t0011-hashmap.sh - -test_oidmap () { - echo "$1" | test-tool oidmap $3 >actual && - echo "$2" >expect && - test_cmp expect actual -} - - -test_expect_success 'setup' ' - - test_commit one && - test_commit two && - test_commit three && - test_commit four - -' - -test_expect_success 'put' ' - -test_oidmap "put one 1 -put two 2 -put invalidOid 4 -put three 3" "NULL -NULL -Unknown oid: invalidOid -NULL" - -' - -test_expect_success 'replace' ' - -test_oidmap "put one 1 -put two 2 -put three 3 -put invalidOid 4 -put two deux -put one un" "NULL -NULL -NULL -Unknown oid: invalidOid -2 -1" - -' - -test_expect_success 'get' ' - -test_oidmap "put one 1 -put two 2 -put three 3 -get two -get four -get invalidOid -get one" "NULL -NULL -NULL -2 -NULL -Unknown oid: invalidOid -1" - -' - -test_expect_success 'remove' ' - -test_oidmap "put one 1 -put two 2 -put three 3 -remove one -remove two -remove invalidOid -remove four" "NULL -NULL -NULL -1 -2 -Unknown oid: invalidOid -NULL" - -' - -test_expect_success 'iterate' ' - test-tool oidmap >actual.raw <<-\EOF && - put one 1 - put two 2 - put three 3 - iterate - EOF - - # sort "expect" too so we do not rely on the order of particular oids - sort >expect <<-EOF && - NULL - NULL - NULL - $(git rev-parse one) 1 - $(git rev-parse two) 2 - $(git rev-parse three) 3 - EOF - - sort <actual.raw >actual && - test_cmp expect actual -' - -test_done diff --git a/t/t0600-reffiles-backend.sh b/t/t0600-reffiles-backend.sh index b2a771ff2b..20df336cc3 100755 --- a/t/t0600-reffiles-backend.sh +++ b/t/t0600-reffiles-backend.sh @@ -91,82 +91,82 @@ test_expect_success 'empty directory should not fool 1-arg delete' ' git update-ref --stdin ' -test_expect_success 'non-empty directory blocks create' ' +test_expect_success 'non-empty directory blocks create' - <<\EOT prefix=refs/ne-create && mkdir -p .git/$prefix/foo/bar && : >.git/$prefix/foo/bar/baz.lock && test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/foo': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo' EOF printf "%s\n" "update $prefix/foo $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo' EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'broken reference blocks create' ' +test_expect_success 'broken reference blocks create' - <<\EOT prefix=refs/broken-create && mkdir -p .git/$prefix && echo "gobbledigook" >.git/$prefix/foo && test_when_finished "rm -f .git/$prefix/foo" && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken + fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken EOF printf "%s\n" "update $prefix/foo $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken + fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'non-empty directory blocks indirect create' ' +test_expect_success 'non-empty directory blocks indirect create' - <<\EOT prefix=refs/ne-indirect-create && git symbolic-ref $prefix/symref $prefix/foo && mkdir -p .git/$prefix/foo/bar && : >.git/$prefix/foo/bar/baz.lock && test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/symref': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo' EOF printf "%s\n" "update $prefix/symref $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo' EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'broken reference blocks indirect create' ' +test_expect_success 'broken reference blocks indirect create' - <<\EOT prefix=refs/broken-indirect-create && git symbolic-ref $prefix/symref $prefix/foo && echo "gobbledigook" >.git/$prefix/foo && test_when_finished "rm -f .git/$prefix/foo" && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken + fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken EOF printf "%s\n" "update $prefix/symref $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken + fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT test_expect_success 'no bogus intermediate values during delete' ' prefix=refs/slow-transaction && @@ -224,7 +224,7 @@ test_expect_success 'no bogus intermediate values during delete' ' test_must_fail git rev-parse --verify --quiet $prefix/foo ' -test_expect_success 'delete fails cleanly if packed-refs file is locked' ' +test_expect_success 'delete fails cleanly if packed-refs file is locked' - <<\EOT prefix=refs/locked-packed-refs && # Set up a reference with differing loose and packed versions: git update-ref $prefix/foo $C && @@ -236,9 +236,9 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' ' test_when_finished "rm -f .git/packed-refs.lock" && test_must_fail git update-ref -d $prefix/foo >out 2>err && git for-each-ref $prefix >actual && - test_grep "Unable to create $SQ.*packed-refs.lock$SQ: " err && + test_grep "Unable to create '.*packed-refs.lock': " err && test_cmp unchanged actual -' +EOT test_expect_success 'delete fails cleanly if packed-refs.new write fails' ' # Setup and expectations are similar to the test above. diff --git a/t/t0612-reftable-jgit-compatibility.sh b/t/t0612-reftable-jgit-compatibility.sh index d0d7e80b49..84922153ab 100755 --- a/t/t0612-reftable-jgit-compatibility.sh +++ b/t/t0612-reftable-jgit-compatibility.sh @@ -11,6 +11,7 @@ export GIT_TEST_DEFAULT_REF_FORMAT GIT_TEST_SPLIT_INDEX=0 export GIT_TEST_SPLIT_INDEX +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh if ! test_have_prereq JGIT diff --git a/t/t0613-reftable-write-options.sh b/t/t0613-reftable-write-options.sh index e2708e11d5..b1c6c97524 100755 --- a/t/t0613-reftable-write-options.sh +++ b/t/t0613-reftable-write-options.sh @@ -16,6 +16,7 @@ export GIT_TEST_DEFAULT_HASH GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success 'default write options' ' diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 2f1ae5fd3b..a2c0e1b4dc 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -159,7 +159,10 @@ init_repos () { git -C sparse-checkout sparse-checkout set deep && git -C sparse-index sparse-checkout init --cone --sparse-index && test_cmp_config -C sparse-index true index.sparse && - git -C sparse-index sparse-checkout set deep + git -C sparse-index sparse-checkout set deep && + + # Disable this message to keep stderr the same. + git -C sparse-index config advice.sparseIndexExpanded false } init_repos_as_submodules () { @@ -2331,4 +2334,15 @@ test_expect_success 'sparse-index is not expanded: check-attr' ' ensure_not_expanded check-attr -a --cached -- folder1/a ' +test_expect_success 'advice.sparseIndexExpanded' ' + init_repos && + + git -C sparse-index config --unset advice.sparseIndexExpanded && + git -C sparse-index sparse-checkout set deep/deeper1 && + mkdir -p sparse-index/deep/deeper2/deepest && + touch sparse-index/deep/deeper2/deepest/bogus && + git -C sparse-index status 2>err && + grep "The sparse index is expanding to a full index" err +' + test_done diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh index 67ebd81a4c..df90112618 100755 --- a/t/t1404-update-ref-errors.sh +++ b/t/t1404-update-ref-errors.sh @@ -100,13 +100,13 @@ df_test() { printf "%s\n" "delete $delname" "create $addname $D" fi >commands && test_must_fail git update-ref --stdin <commands 2>output.err && - grep -E "fatal:( cannot lock ref $SQ$addname$SQ:)? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err && + grep -E "fatal:( cannot lock ref '$addname':)? '$delref' exists; cannot create '$addref'" output.err && printf "%s\n" "$C $delref" >expected-refs && git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs && test_cmp expected-refs actual-refs } -test_expect_success 'setup' ' +test_expect_success 'setup' - <<\EOT git commit --allow-empty -m Initial && C=$(git rev-parse HEAD) && @@ -114,283 +114,283 @@ test_expect_success 'setup' ' D=$(git rev-parse HEAD) && git commit --allow-empty -m Third && E=$(git rev-parse HEAD) -' +EOT -test_expect_success 'existing loose ref is a simple prefix of new' ' +test_expect_success 'existing loose ref is a simple prefix of new' - <<\EOT prefix=refs/1l && test_update_rejected "a c e" false "b c/x d" \ - "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" + "'$prefix/c' exists; cannot create '$prefix/c/x'" -' +EOT -test_expect_success 'existing packed ref is a simple prefix of new' ' +test_expect_success 'existing packed ref is a simple prefix of new' - <<\EOT prefix=refs/1p && test_update_rejected "a c e" true "b c/x d" \ - "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" + "'$prefix/c' exists; cannot create '$prefix/c/x'" -' +EOT -test_expect_success 'existing loose ref is a deeper prefix of new' ' +test_expect_success 'existing loose ref is a deeper prefix of new' - <<\EOT prefix=refs/2l && test_update_rejected "a c e" false "b c/x/y d" \ - "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" + "'$prefix/c' exists; cannot create '$prefix/c/x/y'" -' +EOT -test_expect_success 'existing packed ref is a deeper prefix of new' ' +test_expect_success 'existing packed ref is a deeper prefix of new' - <<\EOT prefix=refs/2p && test_update_rejected "a c e" true "b c/x/y d" \ - "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" + "'$prefix/c' exists; cannot create '$prefix/c/x/y'" -' +EOT -test_expect_success 'new ref is a simple prefix of existing loose' ' +test_expect_success 'new ref is a simple prefix of existing loose' - <<\EOT prefix=refs/3l && test_update_rejected "a c/x e" false "b c d" \ - "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" + "'$prefix/c/x' exists; cannot create '$prefix/c'" -' +EOT -test_expect_success 'new ref is a simple prefix of existing packed' ' +test_expect_success 'new ref is a simple prefix of existing packed' - <<\EOT prefix=refs/3p && test_update_rejected "a c/x e" true "b c d" \ - "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" + "'$prefix/c/x' exists; cannot create '$prefix/c'" -' +EOT -test_expect_success 'new ref is a deeper prefix of existing loose' ' +test_expect_success 'new ref is a deeper prefix of existing loose' - <<\EOT prefix=refs/4l && test_update_rejected "a c/x/y e" false "b c d" \ - "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" + "'$prefix/c/x/y' exists; cannot create '$prefix/c'" -' +EOT -test_expect_success 'new ref is a deeper prefix of existing packed' ' +test_expect_success 'new ref is a deeper prefix of existing packed' - <<\EOT prefix=refs/4p && test_update_rejected "a c/x/y e" true "b c d" \ - "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" + "'$prefix/c/x/y' exists; cannot create '$prefix/c'" -' +EOT -test_expect_success 'one new ref is a simple prefix of another' ' +test_expect_success 'one new ref is a simple prefix of another' - <<\EOT prefix=refs/5 && test_update_rejected "a e" false "b c c/x d" \ - "cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time" + "cannot process '$prefix/c' and '$prefix/c/x' at the same time" -' +EOT -test_expect_success 'D/F conflict prevents add long + delete short' ' +test_expect_success 'D/F conflict prevents add long + delete short' - <<\EOT df_test refs/df-al-ds --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents add short + delete long' ' +test_expect_success 'D/F conflict prevents add short + delete long' - <<\EOT df_test refs/df-as-dl --add-del foo foo/bar -' +EOT -test_expect_success 'D/F conflict prevents delete long + add short' ' +test_expect_success 'D/F conflict prevents delete long + add short' - <<\EOT df_test refs/df-dl-as --del-add foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents delete short + add long' ' +test_expect_success 'D/F conflict prevents delete short + add long' - <<\EOT df_test refs/df-ds-al --del-add foo foo/bar -' +EOT -test_expect_success 'D/F conflict prevents add long + delete short packed' ' +test_expect_success 'D/F conflict prevents add long + delete short packed' - <<\EOT df_test refs/df-al-dsp --pack --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents add short + delete long packed' ' +test_expect_success 'D/F conflict prevents add short + delete long packed' - <<\EOT df_test refs/df-as-dlp --pack --add-del foo foo/bar -' +EOT -test_expect_success 'D/F conflict prevents delete long packed + add short' ' +test_expect_success 'D/F conflict prevents delete long packed + add short' - <<\EOT df_test refs/df-dlp-as --pack --del-add foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents delete short packed + add long' ' +test_expect_success 'D/F conflict prevents delete short packed + add long' - <<\EOT df_test refs/df-dsp-al --pack --del-add foo foo/bar -' +EOT # Try some combinations involving symbolic refs... -test_expect_success 'D/F conflict prevents indirect add long + delete short' ' +test_expect_success 'D/F conflict prevents indirect add long + delete short' - <<\EOT df_test refs/df-ial-ds --sym-add --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' ' +test_expect_success 'D/F conflict prevents indirect add long + indirect delete short' - <<\EOT df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' ' +test_expect_success 'D/F conflict prevents indirect add short + indirect delete long' - <<\EOT df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar -' +EOT -test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' ' +test_expect_success 'D/F conflict prevents indirect delete long + indirect add short' - <<\EOT df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents indirect add long + delete short packed' ' +test_expect_success 'D/F conflict prevents indirect add long + delete short packed' - <<\EOT df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' ' +test_expect_success 'D/F conflict prevents indirect add long + indirect delete short packed' - <<\EOT df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents add long + indirect delete short packed' ' +test_expect_success 'D/F conflict prevents add long + indirect delete short packed' - <<\EOT df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo -' +EOT -test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' ' +test_expect_success 'D/F conflict prevents indirect delete long packed + indirect add short' - <<\EOT df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo -' +EOT # Test various errors when reading the old values of references... -test_expect_success 'missing old value blocks update' ' +test_expect_success 'missing old value blocks update' - <<\EOT prefix=refs/missing-update && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo' EOF printf "%s\n" "update $prefix/foo $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks update' ' +test_expect_success 'incorrect old value blocks update' - <<\EOT prefix=refs/incorrect-update && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/foo': is at $C but expected $D EOF printf "%s\n" "update $prefix/foo $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'existing old value blocks create' ' +test_expect_success 'existing old value blocks create' - <<\EOT prefix=refs/existing-create && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists + fatal: cannot lock ref '$prefix/foo': reference already exists EOF printf "%s\n" "create $prefix/foo $E" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks delete' ' +test_expect_success 'incorrect old value blocks delete' - <<\EOT prefix=refs/incorrect-delete && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/foo': is at $C but expected $D EOF printf "%s\n" "delete $prefix/foo $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'missing old value blocks indirect update' ' +test_expect_success 'missing old value blocks indirect update' - <<\EOT prefix=refs/missing-indirect-update && git symbolic-ref $prefix/symref $prefix/foo && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ + fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo' EOF printf "%s\n" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks indirect update' ' +test_expect_success 'incorrect old value blocks indirect update' - <<\EOT prefix=refs/incorrect-indirect-update && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/symref': is at $C but expected $D EOF printf "%s\n" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'existing old value blocks indirect create' ' +test_expect_success 'existing old value blocks indirect create' - <<\EOT prefix=refs/existing-indirect-create && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists + fatal: cannot lock ref '$prefix/symref': reference already exists EOF printf "%s\n" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks indirect delete' ' +test_expect_success 'incorrect old value blocks indirect delete' - <<\EOT prefix=refs/incorrect-indirect-delete && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/symref': is at $C but expected $D EOF printf "%s\n" "delete $prefix/symref $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'missing old value blocks indirect no-deref update' ' +test_expect_success 'missing old value blocks indirect no-deref update' - <<\EOT prefix=refs/missing-noderef-update && git symbolic-ref $prefix/symref $prefix/foo && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D + fatal: cannot lock ref '$prefix/symref': reference is missing but expected $D EOF printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks indirect no-deref update' ' +test_expect_success 'incorrect old value blocks indirect no-deref update' - <<\EOT prefix=refs/incorrect-noderef-update && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/symref': is at $C but expected $D EOF printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'existing old value blocks indirect no-deref create' ' +test_expect_success 'existing old value blocks indirect no-deref create' - <<\EOT prefix=refs/existing-noderef-create && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists + fatal: cannot lock ref '$prefix/symref': reference already exists EOF printf "%s\n" "option no-deref" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT -test_expect_success 'incorrect old value blocks indirect no-deref delete' ' +test_expect_success 'incorrect old value blocks indirect no-deref delete' - <<\EOT prefix=refs/incorrect-noderef-delete && git symbolic-ref $prefix/symref $prefix/foo && git update-ref $prefix/foo $C && cat >expected <<-EOF && - fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D + fatal: cannot lock ref '$prefix/symref': is at $C but expected $D EOF printf "%s\n" "option no-deref" "delete $prefix/symref $D" | test_must_fail git update-ref --stdin 2>output.err && test_cmp expected output.err -' +EOT test_done diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 1b8617e0c1..718438ffc7 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -1212,4 +1212,23 @@ test_expect_success 'reset -p with unmerged files' ' test_must_be_empty staged ' +test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' ' + test_config diff.suppressBlankEmpty true && + write_script fake-editor.sh <<-\EOF && + tr F G <"$1" >"$1.tmp" && + mv "$1.tmp" "$1" + EOF + + test_write_lines a b "" c d "" e f "" >file && + git add file && + test_write_lines A b "" c D "" e F "" >file && + ( + test_set_editor "$(pwd)/fake-editor.sh" && + test_write_lines s n y e q | git add -p file + ) && + git cat-file blob :file >actual && + test_write_lines a b "" c D "" e G "" >expect && + test_cmp expect actual +' + test_done diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh index a4d0c03ca6..dd6ad8f7a8 100755 --- a/t/t4153-am-resume-override-opts.sh +++ b/t/t4153-am-resume-override-opts.sh @@ -99,7 +99,7 @@ test_expect_success '--reject overrides --no-reject' ' test_path_is_dir .git/rebase-apply && test_path_is_missing file.rej && - test_must_fail git am --retry --reject </dev/zero && + test_must_fail git am --retry --reject && test_path_is_dir .git/rebase-apply && test_path_is_file file.rej ' diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 10d2a6bf92..ace5ac3b61 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -1027,6 +1027,61 @@ test_expect_success 'repack --batch-size=<large> repacks everything' ' ) ' +test_expect_success 'repack/expire loop' ' + git init repack-expire && + test_when_finished "rm -fr repack-expire" && + ( + cd repack-expire && + + test_commit_bulk 5 && + + # Create three overlapping pack-files + git rev-list --objects HEAD~3 >in-1 && + git rev-list --objects HEAD~4..HEAD~2 >in-2 && + git rev-list --objects HEAD~3..HEAD >in-3 && + + # Create disconnected blobs + obj1=$(git hash-object -w in-1) && + obj2=$(git hash-object -w in-2) && + obj3=$(git hash-object -w in-3) && + + echo $obj2 >>in-2 && + echo $obj3 >>in-3 && + + for i in $(test_seq 3) + do + git pack-objects .git/objects/pack/test-$i <in-$i \ + || return 1 + done && + + rm -fr .git/objects/pack/pack-* && + git multi-pack-index write && + + for i in $(test_seq 3) + do + for file in $(ls .git/objects/pack/test-$i*) + do + test-tool chmtime =+$((3600*$i-25000)) $file || return 1 + done || return 1 + done && + + pack1=$(ls .git/objects/pack/test-1-*.pack) && + pack2=$(ls .git/objects/pack/test-2-*.pack) && + pack3=$(ls .git/objects/pack/test-3-*.pack) && + + # Prevent test-1 from being rewritten. + touch "${pack1%.pack}.keep" && + + # This repack-expire loop should repack all non-kept packs + # into a new pack and then delete the old packs. + git multi-pack-index repack && + git multi-pack-index expire && + + test_path_is_missing $pack3 && + test_path_is_missing $pack2 + ) +' + test_expect_success 'load reverse index when missing .idx, .pack' ' git init repo && test_when_finished "rm -fr repo" && diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 2e7c0e1648..9d693eb57f 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -230,6 +230,16 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f test_grep "push negotiation failed" err ' +test_expect_success 'push deletion with negotiation' ' + mk_empty testrepo && + git push testrepo $the_first_commit:refs/heads/master && + git -c push.negotiate=1 push testrepo \ + :master $the_first_commit:refs/heads/next 2>errors-2 && + test_grep ! "negotiate-only needs one or " errors-2 && + git -c push.negotiate=1 push testrepo :next 2>errors-1 && + test_grep ! "negotiate-only needs one or " errors-1 +' + test_expect_success 'push with negotiation does not attempt to fetch submodules' ' mk_empty submodule_upstream && test_commit -C submodule_upstream submodule_commit && diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh index 0247137cb3..17d7257892 100755 --- a/t/t5529-push-errors.sh +++ b/t/t5529-push-errors.sh @@ -2,6 +2,9 @@ test_description='detect some push errors early (before contacting remote)' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh @@ -38,6 +41,20 @@ test_expect_success 'detect missing sha1 expressions early' ' test_cmp expect rp-ran ' +# We use an existing local_ref, since it follows a different flow in +# 'builtin/push.c:set_refspecs()' and we want to test that regression. +test_expect_success 'detect empty remote with existing local ref' ' + test_must_fail git push "" main 2> stderr && + grep "fatal: bad repository ${SQ}${SQ}" stderr +' + +# While similar to the previous test, here we want to ensure that +# even targeted refspecs are handled. +test_expect_success 'detect empty remote with targeted refspec' ' + test_must_fail git push "" HEAD:refs/heads/main 2> stderr && + grep "fatal: bad repository ${SQ}${SQ}" stderr +' + test_expect_success 'detect ambiguous refs early' ' git branch foo && git tag foo && diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index a623a1058c..7b5ab0eae1 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -643,7 +643,6 @@ test_expect_success 'clone empty SHA-256 repository with protocol v0' ' test_expect_success 'passing hostname resolution information works' ' BOGUS_HOST=gitbogusexamplehost.invalid && BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT && - test_must_fail git ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null && git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null ' diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh index 48050162c2..70e3376d31 100755 --- a/t/t5553-set-upstream.sh +++ b/t/t5553-set-upstream.sh @@ -73,10 +73,10 @@ test_expect_success 'fetch --set-upstream main:other does not set the branch oth check_config_missing other2 ' -test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' ' +test_expect_success 'fetch --set-upstream ./does-not-exist fails with invalid url' ' # main explicitly not cleared, we check that it is not touched from previous value clear_config other other2 && - test_must_fail git fetch --set-upstream http://nosuchdomain.example.com && + test_must_fail git fetch --set-upstream ./does-not-exist && check_config main upstream refs/heads/other && check_config_missing other && check_config_missing other2 @@ -143,10 +143,10 @@ test_expect_success 'pull --set-upstream upstream tag does not set the tag' ' check_config_missing three ' -test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' ' +test_expect_success 'pull --set-upstream ./does-not-exist fails with invalid url' ' # main explicitly not cleared, we check that it is not touched from previous value clear_config other other2 three && - test_must_fail git pull --set-upstream http://nosuchdomain.example.com && + test_must_fail git pull --set-upstream ./does-not-exist && check_config main upstream refs/heads/other && check_config_missing other && check_config_missing other2 && diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh index 4af796de67..ba03f6a09f 100755 --- a/t/t5563-simple-http-auth.sh +++ b/t/t5563-simple-http-auth.sh @@ -178,6 +178,122 @@ test_expect_success 'access using basic auth invalid credentials' ' EOF ' +test_expect_success 'access using basic proactive auth' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + id=1 status=200 + id=default status=403 + EOF + + test_config_global credential.helper test-helper && + test_config_global http.proactiveAuth basic && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + capability[]=authtype + capability[]=state + protocol=http + host=$HTTPD_DEST + wwwauth[]=Basic + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using auto proactive auth with basic default' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + id=1 status=200 + id=default status=403 + EOF + + test_config_global credential.helper test-helper && + test_config_global http.proactiveAuth auto && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + capability[]=authtype + capability[]=state + protocol=http + host=$HTTPD_DEST + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using auto proactive auth with authtype from credential helper' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + capability[]=authtype + authtype=Bearer + credential=YS1naXQtdG9rZW4= + EOF + + # Basic base64(a-git-token) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + id=1 creds=Bearer YS1naXQtdG9rZW4= + EOF + + CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" && + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + id=1 status=200 + id=default status=403 + EOF + + test_config_global credential.helper test-helper && + test_config_global http.proactiveAuth auto && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + capability[]=authtype + capability[]=state + protocol=http + host=$HTTPD_DEST + EOF + + expect_credential_query store <<-EOF + capability[]=authtype + authtype=Bearer + credential=YS1naXQtdG9rZW4= + protocol=http + host=$HTTPD_DEST + EOF +' + test_expect_success 'access using basic auth with extra challenges' ' test_when_finished "per_test_cleanup" && diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index e78315d23d..79e0f19deb 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -671,4 +671,40 @@ test_expect_success 'setup misleading taggerdates' ' check_describe newer-tag-older-commit~1 --contains unique-file~2 +test_expect_success 'describe --dirty with a file with changed stat' ' + test_when_finished "rm -fr stat-dirty" && + git init stat-dirty && + ( + cd stat-dirty && + + echo A >file && + git add file && + git commit -m A && + git tag A -a -m A && + echo "A" >expect && + + test-tool chmtime -10 file && + git describe --dirty >actual && + test_cmp expect actual + ) +' + +test_expect_success 'describe --broken --dirty with a file with changed stat' ' + test_when_finished "rm -fr stat-dirty" && + git init stat-dirty && + ( + cd stat-dirty && + + echo A >file && + git add file && + git commit -m A && + git tag A -a -m A && + echo "A" >expect && + + test-tool chmtime -10 file && + git describe --dirty --broken >actual && + test_cmp expect actual + ) +' + test_done diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh index 156a1efacf..9bf9524934 100755 --- a/t/t6406-merge-attr.sh +++ b/t/t6406-merge-attr.sh @@ -185,7 +185,7 @@ test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' >./please-abort && echo "* merge=custom" >.gitattributes && - test_must_fail git merge main 2>err && + test_expect_code 2 git merge main 2>err && grep "^error: failed to execute internal merge" err && git ls-files -u >output && git diff --name-only HEAD >>output && @@ -261,4 +261,44 @@ test_expect_success 'binary files with union attribute' ' grep -i "warning.*cannot merge.*HEAD vs. bin-main" output ' +test_expect_success !WINDOWS 'custom merge driver that is killed with a signal on recursive merge' ' + test_when_finished "rm -f output please-abort" && + test_when_finished "git checkout side" && + + git reset --hard anchor && + + git checkout -b base-a main^ && + echo base-a >text && + git commit -m base-a text && + + git checkout -b base-b main^ && + echo base-b >text && + git commit -m base-b text && + + git checkout -b recursive-a base-a && + test_must_fail git merge base-b && + echo recursive-a >text && + git add text && + git commit -m recursive-a && + + git checkout -b recursive-b base-b && + test_must_fail git merge base-a && + echo recursive-b >text && + git add text && + git commit -m recursive-b && + + git config --replace-all \ + merge.custom.driver "./custom-merge %O %A %B 0 %P %S %X %Y" && + git config --replace-all \ + merge.custom.name "custom merge driver for testing" && + + >./please-abort && + echo "* merge=custom" >.gitattributes && + test_expect_code 2 git merge recursive-a 2>err && + grep "error: failed to execute internal merge" err && + git ls-files -u >output && + git diff --name-only HEAD >>output && + test_must_be_empty output +' + test_done diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 189d8e341b..2d984eb4c6 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -498,6 +498,19 @@ test_expect_success 'checkout unmerged stage' ' test ztheirside = "z$(cat file)" ' +test_expect_success 'checkout --ours is incompatible with switching' ' + test_must_fail git checkout --ours 2>error && + test_grep "needs the paths to check out" error && + + test_must_fail git checkout --ours HEAD 2>error && + test_grep "cannot be used with switching" error && + + test_must_fail git checkout --ours main 2>error && + test_grep "cannot be used with switching" error && + + git checkout --ours file +' + test_expect_success 'checkout path with --merge from tree-ish is a no-no' ' setup_conflicting_index && test_must_fail git checkout -m HEAD -- file diff --git a/t/t7615-diff-algo-with-mergy-operations.sh b/t/t7615-diff-algo-with-mergy-operations.sh new file mode 100755 index 0000000000..9a83be518c --- /dev/null +++ b/t/t7615-diff-algo-with-mergy-operations.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +test_description='git merge and other operations that rely on merge + +Testing the influence of the diff algorithm on the merge output.' + +TEST_PASSES_SANITIZE_LEAK=true +. ./test-lib.sh + +test_expect_success 'setup' ' + cp "$TEST_DIRECTORY"/t7615/base.c file.c && + git add file.c && + git commit -m c0 && + git tag c0 && + cp "$TEST_DIRECTORY"/t7615/ours.c file.c && + git add file.c && + git commit -m c1 && + git tag c1 && + git reset --hard c0 && + cp "$TEST_DIRECTORY"/t7615/theirs.c file.c && + git add file.c && + git commit -m c2 && + git tag c2 +' + +GIT_TEST_MERGE_ALGORITHM=recursive + +test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' + git reset --hard c1 && + test_must_fail git merge -s recursive c2 +' + +test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' ' + git reset --hard c1 && + git merge --strategy recursive -Xdiff-algorithm=histogram c2 +' + +test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram' ' + git reset --hard c1 && + git config diff.algorithm histogram && + git merge --strategy recursive c2 +' + +test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' + git reset --hard c1 && + test_must_fail git cherry-pick -s recursive c2 +' + +test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' ' + git reset --hard c1 && + git cherry-pick --strategy recursive -Xdiff-algorithm=histogram c2 +' + +test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram' ' + git reset --hard c1 && + git config diff.algorithm histogram && + git cherry-pick --strategy recursive c2 +' + +test_done diff --git a/t/t7615/base.c b/t/t7615/base.c new file mode 100644 index 0000000000..c64abc5936 --- /dev/null +++ b/t/t7615/base.c @@ -0,0 +1,17 @@ +int f(int x, int y) +{ + if (x == 0) + { + return y; + } + return x; +} + +int g(size_t u) +{ + while (u < 30) + { + u++; + } + return u; +} diff --git a/t/t7615/ours.c b/t/t7615/ours.c new file mode 100644 index 0000000000..44d8251397 --- /dev/null +++ b/t/t7615/ours.c @@ -0,0 +1,17 @@ +int g(size_t u) +{ + while (u < 30) + { + u++; + } + return u; +} + +int h(int x, int y, int z) +{ + if (z == 0) + { + return x; + } + return y; +} diff --git a/t/t7615/theirs.c b/t/t7615/theirs.c new file mode 100644 index 0000000000..85f02146fe --- /dev/null +++ b/t/t7615/theirs.c @@ -0,0 +1,17 @@ +int f(int x, int y) +{ + if (x == 0) + { + return y; + } + return x; +} + +int g(size_t u) +{ + while (u > 34) + { + u--; + } + return u; +} diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 58699f8e4e..64a4ab3736 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1299,6 +1299,49 @@ test_expect_success $PREREQ 'utf8 sender is not duplicated' ' test_line_count = 1 msgfrom ' +test_expect_success $PREREQ 'setup expect for cc list' " +cat >expected-cc <<\EOF +!recipient@example.com! +!author@example.com! +!one@example.com! +!os@example.com! +!odd_?=mail@example.com! +!doug@example.com! +!codev@example.com! +!thor.au@example.com! +EOF +" + +test_expect_success $PREREQ 'cc list is sanitized' ' + clean_fake_sendmail && + test_commit weird_cc_body && + test_when_finished "git reset --hard HEAD^" && + git commit --amend -F - <<-EOF && + Test Cc: sanitization. + + Cc: Person, One <one@example.com> + Cc: Ronnie O${SQ}Sullivan <os@example.com> + Reviewed-by: Füñný Nâmé <odd_?=mail@example.com> + Reported-by: bugger on Jira + Reported-by: Douglas Reporter <doug@example.com> [from Jira profile] + BugID: 12345 + Co-developed-by: "C. O. Developer" <codev@example.com> + Signed-off-by: A. U. Thor <thor.au@example.com> + EOF + git send-email -1 --to=recipient@example.com \ + --smtp-server="$(pwd)/fake.sendmail" >actual-show-all-headers && + test_cmp expected-cc commandline1 && + test_grep "^(body) Adding cc: \"Person, One\" <one@example.com>" actual-show-all-headers && + test_grep "^(body) Adding cc: Ronnie O${SQ}Sullivan <os@example.com>" actual-show-all-headers && + test_grep "^(body) Adding cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?="\ +" <odd_?=mail@example.com>" actual-show-all-headers && + test_grep "^(body) Ignoring Reported-by .* bugger on Jira" actual-show-all-headers && + test_grep "^(body) Adding cc: Douglas Reporter <doug@example.com>" actual-show-all-headers && + test_grep ! "12345" actual-show-all-headers && + test_grep "^(body) Adding cc: \"C. O. Developer\" <codev@example.com>" actual-show-all-headers && + test_grep "^(body) Adding cc: \"A. U. Thor\" <thor.au@example.com>" actual-show-all-headers +' + test_expect_success $PREREQ 'sendemail.composeencoding works' ' clean_fake_sendmail && git config sendemail.composeencoding iso-8859-1 && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 1ea9f31225..fde9bf54fc 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -872,6 +872,24 @@ test_verify_prereq () { BUG "'$test_prereq' does not look like a prereq" } +# assign the variable named by "$1" with the contents of "$2"; +# if "$2" is "-", then read stdin into "$1" instead +test_body_or_stdin () { + if test "$2" != "-" + then + eval "$1=\$2" + return + fi + + # start with a newline, to match hanging newline from open-quote style + eval "$1=\$LF" + local test_line + while IFS= read -r test_line + do + eval "$1=\${$1}\${test_line}\${LF}" + done +} + test_expect_failure () { test_start_ "$@" test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= @@ -881,9 +899,11 @@ test_expect_failure () { export test_prereq if ! test_skip "$@" then + local test_body + test_body_or_stdin test_body "$2" test -n "$test_skip_test_preamble" || - say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2" - if test_run_ "$2" expecting_failure + say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $test_body" + if test_run_ "$test_body" expecting_failure then test_known_broken_ok_ "$1" else @@ -902,13 +922,15 @@ test_expect_success () { export test_prereq if ! test_skip "$@" then + local test_body + test_body_or_stdin test_body "$2" test -n "$test_skip_test_preamble" || - say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2" - if test_run_ "$2" + say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $test_body" + if test_run_ "$test_body" then test_ok_ "$1" else - test_failure_ "$@" + test_failure_ "$1" "$test_body" fi fi test_finish_ diff --git a/t/test-lib.sh b/t/test-lib.sh index 79d3e0e7d9..54247604cb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1269,9 +1269,12 @@ check_test_results_san_file_ () { then say "As TEST_PASSES_SANITIZE_LEAK=true isn't set the above leak is 'ok' with GIT_TEST_PASSING_SANITIZE_LEAK=check" && invert_exit_code=t - else - say "With GIT_TEST_SANITIZE_LEAK_LOG=true our logs revealed a memory leak, exit non-zero!" && + elif test "$test_failure" = 0 + then + say "Our logs revealed a memory leak, exit non-zero!" && invert_exit_code=t + else + say "Our logs revealed a memory leak..." fi } @@ -1575,33 +1578,28 @@ then test_done fi - if test_bool_env GIT_TEST_SANITIZE_LEAK_LOG false + if ! mkdir -p "$TEST_RESULTS_SAN_DIR" then - if ! mkdir -p "$TEST_RESULTS_SAN_DIR" - then - BAIL_OUT "cannot create $TEST_RESULTS_SAN_DIR" - fi && - TEST_RESULTS_SAN_FILE="$TEST_RESULTS_SAN_DIR/$TEST_RESULTS_SAN_FILE_PFX" + BAIL_OUT "cannot create $TEST_RESULTS_SAN_DIR" + fi && + TEST_RESULTS_SAN_FILE="$TEST_RESULTS_SAN_DIR/$TEST_RESULTS_SAN_FILE_PFX" - # In case "test-results" is left over from a previous - # run: Only report if new leaks show up. - TEST_RESULTS_SAN_DIR_NR_LEAKS_STARTUP=$(nr_san_dir_leaks_) + # In case "test-results" is left over from a previous + # run: Only report if new leaks show up. + TEST_RESULTS_SAN_DIR_NR_LEAKS_STARTUP=$(nr_san_dir_leaks_) - # Don't litter *.leak dirs if there was nothing to report - test_atexit "rmdir \"$TEST_RESULTS_SAN_DIR\" 2>/dev/null || :" + # Don't litter *.leak dirs if there was nothing to report + test_atexit "rmdir \"$TEST_RESULTS_SAN_DIR\" 2>/dev/null || :" + + prepend_var LSAN_OPTIONS : dedup_token_length=9999 + prepend_var LSAN_OPTIONS : log_exe_name=1 + prepend_var LSAN_OPTIONS : log_path=\"$TEST_RESULTS_SAN_FILE\" + export LSAN_OPTIONS - prepend_var LSAN_OPTIONS : dedup_token_length=9999 - prepend_var LSAN_OPTIONS : log_exe_name=1 - prepend_var LSAN_OPTIONS : log_path=\"$TEST_RESULTS_SAN_FILE\" - export LSAN_OPTIONS - fi elif test "$GIT_TEST_PASSING_SANITIZE_LEAK" = "check" || test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false then BAIL_OUT_ENV_NEEDS_SANITIZE_LEAK "GIT_TEST_PASSING_SANITIZE_LEAK=true" -elif test_bool_env GIT_TEST_SANITIZE_LEAK_LOG false -then - BAIL_OUT_ENV_NEEDS_SANITIZE_LEAK "GIT_TEST_SANITIZE_LEAK_LOG=true" fi if test "${GIT_TEST_CHAIN_LINT:-1}" != 0 && diff --git a/t/unit-tests/t-oidmap.c b/t/unit-tests/t-oidmap.c new file mode 100644 index 0000000000..b22e52d08b --- /dev/null +++ b/t/unit-tests/t-oidmap.c @@ -0,0 +1,181 @@ +#include "test-lib.h" +#include "lib-oid.h" +#include "oidmap.h" +#include "hash.h" +#include "hex.h" + +/* + * Elements we will put in oidmap structs are made of a key: the entry.oid + * field, which is of type struct object_id, and a value: the name field (could + * be a refname for example). + */ +struct test_entry { + struct oidmap_entry entry; + char name[FLEX_ARRAY]; +}; + +static const char *const key_val[][2] = { { "11", "one" }, + { "22", "two" }, + { "33", "three" } }; + +static void setup(void (*f)(struct oidmap *map)) +{ + struct oidmap map = OIDMAP_INIT; + int ret = 0; + + for (size_t i = 0; i < ARRAY_SIZE(key_val); i++){ + struct test_entry *entry; + + FLEX_ALLOC_STR(entry, name, key_val[i][1]); + if ((ret = get_oid_arbitrary_hex(key_val[i][0], &entry->entry.oid))) { + free(entry); + break; + } + entry = oidmap_put(&map, entry); + if (!check(entry == NULL)) + free(entry); + } + + if (!ret) + f(&map); + oidmap_free(&map, 1); +} + +static void t_replace(struct oidmap *map) +{ + struct test_entry *entry, *prev; + + FLEX_ALLOC_STR(entry, name, "un"); + if (get_oid_arbitrary_hex("11", &entry->entry.oid)) + return; + prev = oidmap_put(map, entry); + if (!check(prev != NULL)) + return; + check_str(prev->name, "one"); + free(prev); + + FLEX_ALLOC_STR(entry, name, "deux"); + if (get_oid_arbitrary_hex("22", &entry->entry.oid)) + return; + prev = oidmap_put(map, entry); + if (!check(prev != NULL)) + return; + check_str(prev->name, "two"); + free(prev); +} + +static void t_get(struct oidmap *map) +{ + struct test_entry *entry; + struct object_id oid; + + if (get_oid_arbitrary_hex("22", &oid)) + return; + entry = oidmap_get(map, &oid); + if (!check(entry != NULL)) + return; + check_str(entry->name, "two"); + + if (get_oid_arbitrary_hex("44", &oid)) + return; + check(oidmap_get(map, &oid) == NULL); + + if (get_oid_arbitrary_hex("11", &oid)) + return; + entry = oidmap_get(map, &oid); + if (!check(entry != NULL)) + return; + check_str(entry->name, "one"); +} + +static void t_remove(struct oidmap *map) +{ + struct test_entry *entry; + struct object_id oid; + + if (get_oid_arbitrary_hex("11", &oid)) + return; + entry = oidmap_remove(map, &oid); + if (!check(entry != NULL)) + return; + check_str(entry->name, "one"); + check(oidmap_get(map, &oid) == NULL); + free(entry); + + if (get_oid_arbitrary_hex("22", &oid)) + return; + entry = oidmap_remove(map, &oid); + if (!check(entry != NULL)) + return; + check_str(entry->name, "two"); + check(oidmap_get(map, &oid) == NULL); + free(entry); + + if (get_oid_arbitrary_hex("44", &oid)) + return; + check(oidmap_remove(map, &oid) == NULL); +} + +static int key_val_contains(struct test_entry *entry, char seen[]) +{ + for (size_t i = 0; i < ARRAY_SIZE(key_val); i++) { + struct object_id oid; + + if (get_oid_arbitrary_hex(key_val[i][0], &oid)) + return -1; + + if (oideq(&entry->entry.oid, &oid)) { + if (seen[i]) + return 2; + seen[i] = 1; + return 0; + } + } + return 1; +} + +static void t_iterate(struct oidmap *map) +{ + struct oidmap_iter iter; + struct test_entry *entry; + char seen[ARRAY_SIZE(key_val)] = { 0 }; + int count = 0; + + oidmap_iter_init(map, &iter); + while ((entry = oidmap_iter_next(&iter))) { + int ret; + if (!check_int((ret = key_val_contains(entry, seen)), ==, 0)) { + switch (ret) { + case -1: + break; /* error message handled by get_oid_arbitrary_hex() */ + case 1: + test_msg("obtained entry was not given in the input\n" + " name: %s\n oid: %s\n", + entry->name, oid_to_hex(&entry->entry.oid)); + break; + case 2: + test_msg("duplicate entry detected\n" + " name: %s\n oid: %s\n", + entry->name, oid_to_hex(&entry->entry.oid)); + break; + default: + test_msg("BUG: invalid return value (%d) from key_val_contains()", + ret); + break; + } + } else { + count++; + } + } + check_int(count, ==, ARRAY_SIZE(key_val)); + check_int(hashmap_get_size(&map->map), ==, ARRAY_SIZE(key_val)); +} + +int cmd_main(int argc UNUSED, const char **argv UNUSED) +{ + TEST(setup(t_replace), "replace works"); + TEST(setup(t_get), "get works"); + TEST(setup(t_remove), "remove works"); + TEST(setup(t_iterate), "iterate works"); + return test_done(); +} diff --git a/reftable/merged_test.c b/t/unit-tests/t-reftable-merged.c index a9d6661c13..b6263ee8b5 100644 --- a/reftable/merged_test.c +++ b/t/unit-tests/t-reftable-merged.c @@ -6,27 +6,33 @@ license that can be found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd */ -#include "merged.h" - -#include "system.h" +#include "test-lib.h" +#include "reftable/blocksource.h" +#include "reftable/constants.h" +#include "reftable/merged.h" +#include "reftable/reader.h" +#include "reftable/reftable-error.h" +#include "reftable/reftable-generic.h" +#include "reftable/reftable-merged.h" +#include "reftable/reftable-writer.h" + +static ssize_t strbuf_add_void(void *b, const void *data, const size_t sz) +{ + strbuf_add(b, data, sz); + return sz; +} -#include "basics.h" -#include "blocksource.h" -#include "constants.h" -#include "reader.h" -#include "record.h" -#include "test_framework.h" -#include "reftable-merged.h" -#include "reftable-tests.h" -#include "reftable-generic.h" -#include "reftable-writer.h" +static int noop_flush(void *arg) +{ + return 0; +} static void write_test_table(struct strbuf *buf, - struct reftable_ref_record refs[], int n) + struct reftable_ref_record refs[], const size_t n) { uint64_t min = 0xffffffff; uint64_t max = 0; - int i = 0; + size_t i; int err; struct reftable_write_options opts = { @@ -35,12 +41,10 @@ static void write_test_table(struct strbuf *buf, struct reftable_writer *w = NULL; for (i = 0; i < n; i++) { uint64_t ui = refs[i].update_index; - if (ui > max) { + if (ui > max) max = ui; - } - if (ui < min) { + if (ui < min) min = ui; - } } w = reftable_new_writer(&strbuf_add_void, &noop_flush, buf, &opts); @@ -49,21 +53,19 @@ static void write_test_table(struct strbuf *buf, for (i = 0; i < n; i++) { uint64_t before = refs[i].update_index; int n = reftable_writer_add_ref(w, &refs[i]); - EXPECT(n == 0); - EXPECT(before == refs[i].update_index); + check_int(n, ==, 0); + check_int(before, ==, refs[i].update_index); } err = reftable_writer_close(w); - EXPECT_ERR(err); + check(!err); reftable_writer_free(w); } -static void write_test_log_table(struct strbuf *buf, - struct reftable_log_record logs[], int n, - uint64_t update_index) +static void write_test_log_table(struct strbuf *buf, struct reftable_log_record logs[], + const size_t n, const uint64_t update_index) { - int i = 0; int err; struct reftable_write_options opts = { @@ -74,13 +76,13 @@ static void write_test_log_table(struct strbuf *buf, w = reftable_new_writer(&strbuf_add_void, &noop_flush, buf, &opts); reftable_writer_set_limits(w, update_index, update_index); - for (i = 0; i < n; i++) { + for (size_t i = 0; i < n; i++) { int err = reftable_writer_add_log(w, &logs[i]); - EXPECT_ERR(err); + check(!err); } err = reftable_writer_close(w); - EXPECT_ERR(err); + check(!err); reftable_writer_free(w); } @@ -88,8 +90,8 @@ static void write_test_log_table(struct strbuf *buf, static struct reftable_merged_table * merged_table_from_records(struct reftable_ref_record **refs, struct reftable_block_source **source, - struct reftable_reader ***readers, int *sizes, - struct strbuf *buf, size_t n) + struct reftable_reader ***readers, const size_t *sizes, + struct strbuf *buf, const size_t n) { struct reftable_merged_table *mt = NULL; struct reftable_table *tabs; @@ -105,24 +107,23 @@ merged_table_from_records(struct reftable_ref_record **refs, err = reftable_new_reader(&(*readers)[i], &(*source)[i], "name"); - EXPECT_ERR(err); + check(!err); reftable_table_from_reader(&tabs[i], (*readers)[i]); } err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); - EXPECT_ERR(err); + check(!err); return mt; } -static void readers_destroy(struct reftable_reader **readers, size_t n) +static void readers_destroy(struct reftable_reader **readers, const size_t n) { - int i = 0; - for (; i < n; i++) + for (size_t i = 0; i < n; i++) reftable_reader_free(readers[i]); reftable_free(readers); } -static void test_merged_between(void) +static void t_merged_single_record(void) { struct reftable_ref_record r1[] = { { .refname = (char *) "b", @@ -135,37 +136,40 @@ static void test_merged_between(void) .update_index = 2, .value_type = REFTABLE_REF_DELETION, } }; + struct reftable_ref_record r3[] = { { + .refname = (char *) "c", + .update_index = 3, + .value_type = REFTABLE_REF_DELETION, + } }; - struct reftable_ref_record *refs[] = { r1, r2 }; - int sizes[] = { 1, 1 }; - struct strbuf bufs[2] = { STRBUF_INIT, STRBUF_INIT }; + struct reftable_ref_record *refs[] = { r1, r2, r3 }; + size_t sizes[] = { ARRAY_SIZE(r1), ARRAY_SIZE(r2), ARRAY_SIZE(r3) }; + struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }; struct reftable_block_source *bs = NULL; struct reftable_reader **readers = NULL; struct reftable_merged_table *mt = - merged_table_from_records(refs, &bs, &readers, sizes, bufs, 2); - int i; - struct reftable_ref_record ref = { NULL }; - struct reftable_iterator it = { NULL }; + merged_table_from_records(refs, &bs, &readers, sizes, bufs, 3); + struct reftable_ref_record ref = { 0 }; + struct reftable_iterator it = { 0 }; int err; merged_table_init_iter(mt, &it, BLOCK_TYPE_REF); err = reftable_iterator_seek_ref(&it, "a"); - EXPECT_ERR(err); + check(!err); err = reftable_iterator_next_ref(&it, &ref); - EXPECT_ERR(err); - EXPECT(ref.update_index == 2); + check(!err); + check(reftable_ref_record_equal(&r2[0], &ref, GIT_SHA1_RAWSZ)); reftable_ref_record_release(&ref); reftable_iterator_destroy(&it); - readers_destroy(readers, 2); + readers_destroy(readers, 3); reftable_merged_table_free(mt); - for (i = 0; i < ARRAY_SIZE(bufs); i++) { + for (size_t i = 0; i < ARRAY_SIZE(bufs); i++) strbuf_release(&bufs[i]); - } reftable_free(bs); } -static void test_merged(void) +static void t_merged_refs(void) { struct reftable_ref_record r1[] = { { @@ -215,27 +219,28 @@ static void test_merged(void) }; struct reftable_ref_record *refs[] = { r1, r2, r3 }; - int sizes[3] = { 3, 1, 2 }; + size_t sizes[3] = { ARRAY_SIZE(r1), ARRAY_SIZE(r2), ARRAY_SIZE(r3) }; struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }; struct reftable_block_source *bs = NULL; struct reftable_reader **readers = NULL; struct reftable_merged_table *mt = merged_table_from_records(refs, &bs, &readers, sizes, bufs, 3); - struct reftable_iterator it = { NULL }; + struct reftable_iterator it = { 0 }; int err; struct reftable_ref_record *out = NULL; size_t len = 0; size_t cap = 0; - int i = 0; + size_t i; merged_table_init_iter(mt, &it, BLOCK_TYPE_REF); err = reftable_iterator_seek_ref(&it, "a"); - EXPECT_ERR(err); - EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID); - EXPECT(reftable_merged_table_min_update_index(mt) == 1); + check(!err); + check_int(reftable_merged_table_hash_id(mt), ==, GIT_SHA1_FORMAT_ID); + check_int(reftable_merged_table_min_update_index(mt), ==, 1); + check_int(reftable_merged_table_max_update_index(mt), ==, 3); while (len < 100) { /* cap loops/recursion. */ - struct reftable_ref_record ref = { NULL }; + struct reftable_ref_record ref = { 0 }; int err = reftable_iterator_next_ref(&it, &ref); if (err > 0) break; @@ -245,19 +250,16 @@ static void test_merged(void) } reftable_iterator_destroy(&it); - EXPECT(ARRAY_SIZE(want) == len); - for (i = 0; i < len; i++) { - EXPECT(reftable_ref_record_equal(want[i], &out[i], + check_int(ARRAY_SIZE(want), ==, len); + for (i = 0; i < len; i++) + check(reftable_ref_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); - } - for (i = 0; i < len; i++) { + for (i = 0; i < len; i++) reftable_ref_record_release(&out[i]); - } reftable_free(out); - for (i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) strbuf_release(&bufs[i]); - } readers_destroy(readers, 3); reftable_merged_table_free(mt); reftable_free(bs); @@ -266,8 +268,8 @@ static void test_merged(void) static struct reftable_merged_table * merged_table_from_log_records(struct reftable_log_record **logs, struct reftable_block_source **source, - struct reftable_reader ***readers, int *sizes, - struct strbuf *buf, size_t n) + struct reftable_reader ***readers, const size_t *sizes, + struct strbuf *buf, const size_t n) { struct reftable_merged_table *mt = NULL; struct reftable_table *tabs; @@ -283,16 +285,16 @@ merged_table_from_log_records(struct reftable_log_record **logs, err = reftable_new_reader(&(*readers)[i], &(*source)[i], "name"); - EXPECT_ERR(err); + check(!err); reftable_table_from_reader(&tabs[i], (*readers)[i]); } err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID); - EXPECT_ERR(err); + check(!err); return mt; } -static void test_merged_logs(void) +static void t_merged_logs(void) { struct reftable_log_record r1[] = { { @@ -347,27 +349,28 @@ static void test_merged_logs(void) }; struct reftable_log_record *logs[] = { r1, r2, r3 }; - int sizes[3] = { 2, 1, 1 }; + size_t sizes[3] = { ARRAY_SIZE(r1), ARRAY_SIZE(r2), ARRAY_SIZE(r3) }; struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }; struct reftable_block_source *bs = NULL; struct reftable_reader **readers = NULL; struct reftable_merged_table *mt = merged_table_from_log_records( logs, &bs, &readers, sizes, bufs, 3); - struct reftable_iterator it = { NULL }; + struct reftable_iterator it = { 0 }; int err; struct reftable_log_record *out = NULL; size_t len = 0; size_t cap = 0; - int i = 0; + size_t i; merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG); err = reftable_iterator_seek_log(&it, "a"); - EXPECT_ERR(err); - EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID); - EXPECT(reftable_merged_table_min_update_index(mt) == 1); + check(!err); + check_int(reftable_merged_table_hash_id(mt), ==, GIT_SHA1_FORMAT_ID); + check_int(reftable_merged_table_min_update_index(mt), ==, 1); + check_int(reftable_merged_table_max_update_index(mt), ==, 3); while (len < 100) { /* cap loops/recursion. */ - struct reftable_log_record log = { NULL }; + struct reftable_log_record log = { 0 }; int err = reftable_iterator_next_log(&it, &log); if (err > 0) break; @@ -377,35 +380,32 @@ static void test_merged_logs(void) } reftable_iterator_destroy(&it); - EXPECT(ARRAY_SIZE(want) == len); - for (i = 0; i < len; i++) { - EXPECT(reftable_log_record_equal(want[i], &out[i], + check_int(ARRAY_SIZE(want), ==, len); + for (i = 0; i < len; i++) + check(reftable_log_record_equal(want[i], &out[i], GIT_SHA1_RAWSZ)); - } merged_table_init_iter(mt, &it, BLOCK_TYPE_LOG); err = reftable_iterator_seek_log_at(&it, "a", 2); - EXPECT_ERR(err); + check(!err); reftable_log_record_release(&out[0]); err = reftable_iterator_next_log(&it, &out[0]); - EXPECT_ERR(err); - EXPECT(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ)); + check(!err); + check(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ)); reftable_iterator_destroy(&it); - for (i = 0; i < len; i++) { + for (i = 0; i < len; i++) reftable_log_record_release(&out[i]); - } reftable_free(out); - for (i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) strbuf_release(&bufs[i]); - } readers_destroy(readers, 3); reftable_merged_table_free(mt); reftable_free(bs); } -static void test_default_write_opts(void) +static void t_default_write_opts(void) { struct reftable_write_options opts = { 0 }; struct strbuf buf = STRBUF_INIT; @@ -417,7 +417,7 @@ static void test_default_write_opts(void) .update_index = 1, }; int err; - struct reftable_block_source source = { NULL }; + struct reftable_block_source source = { 0 }; struct reftable_table *tab = reftable_calloc(1, sizeof(*tab)); uint32_t hash_id; struct reftable_reader *rd = NULL; @@ -426,36 +426,38 @@ static void test_default_write_opts(void) reftable_writer_set_limits(w, 1, 1); err = reftable_writer_add_ref(w, &rec); - EXPECT_ERR(err); + check(!err); err = reftable_writer_close(w); - EXPECT_ERR(err); + check(!err); reftable_writer_free(w); block_source_from_strbuf(&source, &buf); err = reftable_new_reader(&rd, &source, "filename"); - EXPECT_ERR(err); + check(!err); hash_id = reftable_reader_hash_id(rd); - EXPECT(hash_id == GIT_SHA1_FORMAT_ID); + check_int(hash_id, ==, GIT_SHA1_FORMAT_ID); reftable_table_from_reader(&tab[0], rd); + err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA256_FORMAT_ID); + check_int(err, ==, REFTABLE_FORMAT_ERROR); err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID); - EXPECT_ERR(err); + check(!err); reftable_reader_free(rd); reftable_merged_table_free(merged); strbuf_release(&buf); } -/* XXX test refs_for(oid) */ -int merged_test_main(int argc, const char *argv[]) +int cmd_main(int argc, const char *argv[]) { - RUN_TEST(test_merged_logs); - RUN_TEST(test_merged_between); - RUN_TEST(test_merged); - RUN_TEST(test_default_write_opts); - return 0; + TEST(t_default_write_opts(), "merged table with default write opts"); + TEST(t_merged_logs(), "merged table with multiple log updates for same ref"); + TEST(t_merged_refs(), "merged table with multiple updates to same ref"); + TEST(t_merged_single_record(), "ref ocurring in only one record can be fetched"); + + return test_done(); } diff --git a/t/unit-tests/t-reftable-record.c b/t/unit-tests/t-reftable-record.c new file mode 100644 index 0000000000..cb649ee419 --- /dev/null +++ b/t/unit-tests/t-reftable-record.c @@ -0,0 +1,551 @@ +/* + Copyright 2020 Google LLC + + Use of this source code is governed by a BSD-style + license that can be found in the LICENSE file or at + https://developers.google.com/open-source/licenses/bsd +*/ + +#include "test-lib.h" +#include "reftable/constants.h" +#include "reftable/record.h" + +static void t_copy(struct reftable_record *rec) +{ + struct reftable_record copy; + uint8_t typ; + + typ = reftable_record_type(rec); + reftable_record_init(©, typ); + reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ); + /* do it twice to catch memory leaks */ + reftable_record_copy_from(©, rec, GIT_SHA1_RAWSZ); + check(reftable_record_equal(rec, ©, GIT_SHA1_RAWSZ)); + + reftable_record_release(©); +} + +static void t_varint_roundtrip(void) +{ + uint64_t inputs[] = { 0, + 1, + 27, + 127, + 128, + 257, + 4096, + ((uint64_t)1 << 63), + ((uint64_t)1 << 63) + ((uint64_t)1 << 63) - 1 }; + + for (size_t i = 0; i < ARRAY_SIZE(inputs); i++) { + uint8_t dest[10]; + + struct string_view out = { + .buf = dest, + .len = sizeof(dest), + }; + uint64_t in = inputs[i]; + int n = put_var_int(&out, in); + uint64_t got = 0; + + check_int(n, >, 0); + out.len = n; + n = get_var_int(&got, &out); + check_int(n, >, 0); + + check_int(got, ==, in); + } +} + +static void set_hash(uint8_t *h, int j) +{ + for (int i = 0; i < hash_size(GIT_SHA1_FORMAT_ID); i++) + h[i] = (j >> i) & 0xff; +} + +static void t_reftable_ref_record_comparison(void) +{ + struct reftable_record in[3] = { + { + .type = BLOCK_TYPE_REF, + .u.ref.refname = (char *) "refs/heads/master", + .u.ref.value_type = REFTABLE_REF_VAL1, + }, + { + .type = BLOCK_TYPE_REF, + .u.ref.refname = (char *) "refs/heads/master", + .u.ref.value_type = REFTABLE_REF_DELETION, + }, + { + .type = BLOCK_TYPE_REF, + .u.ref.refname = (char *) "HEAD", + .u.ref.value_type = REFTABLE_REF_SYMREF, + .u.ref.value.symref = (char *) "refs/heads/master", + }, + }; + + check(!reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); + + check(!reftable_record_equal(&in[1], &in[2], GIT_SHA1_RAWSZ)); + check_int(reftable_record_cmp(&in[1], &in[2]), >, 0); + + in[1].u.ref.value_type = in[0].u.ref.value_type; + check(reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); +} + +static void t_reftable_ref_record_compare_name(void) +{ + struct reftable_ref_record recs[3] = { + { + .refname = (char *) "refs/heads/a" + }, + { + .refname = (char *) "refs/heads/b" + }, + { + .refname = (char *) "refs/heads/a" + }, + }; + + check_int(reftable_ref_record_compare_name(&recs[0], &recs[1]), <, 0); + check_int(reftable_ref_record_compare_name(&recs[1], &recs[0]), >, 0); + check_int(reftable_ref_record_compare_name(&recs[0], &recs[2]), ==, 0); +} + +static void t_reftable_ref_record_roundtrip(void) +{ + struct strbuf scratch = STRBUF_INIT; + + for (int i = REFTABLE_REF_DELETION; i < REFTABLE_NR_REF_VALUETYPES; i++) { + struct reftable_record in = { + .type = BLOCK_TYPE_REF, + .u.ref.value_type = i, + }; + struct reftable_record out = { .type = BLOCK_TYPE_REF }; + struct strbuf key = STRBUF_INIT; + uint8_t buffer[1024] = { 0 }; + struct string_view dest = { + .buf = buffer, + .len = sizeof(buffer), + }; + int n, m; + + in.u.ref.value_type = i; + switch (i) { + case REFTABLE_REF_DELETION: + break; + case REFTABLE_REF_VAL1: + set_hash(in.u.ref.value.val1, 1); + break; + case REFTABLE_REF_VAL2: + set_hash(in.u.ref.value.val2.value, 1); + set_hash(in.u.ref.value.val2.target_value, 2); + break; + case REFTABLE_REF_SYMREF: + in.u.ref.value.symref = xstrdup("target"); + break; + } + in.u.ref.refname = xstrdup("refs/heads/master"); + + t_copy(&in); + + check_int(reftable_record_val_type(&in), ==, i); + check_int(reftable_record_is_deletion(&in), ==, i == REFTABLE_REF_DELETION); + + reftable_record_key(&in, &key); + n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); + check_int(n, >, 0); + + /* decode into a non-zero reftable_record to test for leaks. */ + m = reftable_record_decode(&out, key, i, dest, GIT_SHA1_RAWSZ, &scratch); + check_int(n, ==, m); + + check(reftable_ref_record_equal(&in.u.ref, &out.u.ref, + GIT_SHA1_RAWSZ)); + reftable_record_release(&in); + + strbuf_release(&key); + reftable_record_release(&out); + } + + strbuf_release(&scratch); +} + +static void t_reftable_log_record_comparison(void) +{ + struct reftable_record in[3] = { + { + .type = BLOCK_TYPE_LOG, + .u.log.refname = (char *) "refs/heads/master", + .u.log.update_index = 42, + }, + { + .type = BLOCK_TYPE_LOG, + .u.log.refname = (char *) "refs/heads/master", + .u.log.update_index = 22, + }, + { + .type = BLOCK_TYPE_LOG, + .u.log.refname = (char *) "refs/heads/main", + .u.log.update_index = 22, + }, + }; + + check(!reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_equal(&in[1], &in[2], GIT_SHA1_RAWSZ)); + check_int(reftable_record_cmp(&in[1], &in[2]), >, 0); + /* comparison should be reversed for equal keys, because + * comparison is now performed on the basis of update indices */ + check_int(reftable_record_cmp(&in[0], &in[1]), <, 0); + + in[1].u.log.update_index = in[0].u.log.update_index; + check(reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); +} + +static void t_reftable_log_record_compare_key(void) +{ + struct reftable_log_record logs[3] = { + { + .refname = (char *) "refs/heads/a", + .update_index = 1, + }, + { + .refname = (char *) "refs/heads/b", + .update_index = 2, + }, + { + .refname = (char *) "refs/heads/a", + .update_index = 3, + }, + }; + + check_int(reftable_log_record_compare_key(&logs[0], &logs[1]), <, 0); + check_int(reftable_log_record_compare_key(&logs[1], &logs[0]), >, 0); + + logs[1].update_index = logs[0].update_index; + check_int(reftable_log_record_compare_key(&logs[0], &logs[1]), <, 0); + + check_int(reftable_log_record_compare_key(&logs[0], &logs[2]), >, 0); + check_int(reftable_log_record_compare_key(&logs[2], &logs[0]), <, 0); + logs[2].update_index = logs[0].update_index; + check_int(reftable_log_record_compare_key(&logs[0], &logs[2]), ==, 0); +} + +static void t_reftable_log_record_roundtrip(void) +{ + struct reftable_log_record in[] = { + { + .refname = xstrdup("refs/heads/master"), + .update_index = 42, + .value_type = REFTABLE_LOG_UPDATE, + .value = { + .update = { + .name = xstrdup("han-wen"), + .email = xstrdup("hanwen@google.com"), + .message = xstrdup("test"), + .time = 1577123507, + .tz_offset = 100, + }, + } + }, + { + .refname = xstrdup("refs/heads/master"), + .update_index = 22, + .value_type = REFTABLE_LOG_DELETION, + }, + { + .refname = xstrdup("branch"), + .update_index = 33, + .value_type = REFTABLE_LOG_UPDATE, + } + }; + struct strbuf scratch = STRBUF_INIT; + set_hash(in[0].value.update.new_hash, 1); + set_hash(in[0].value.update.old_hash, 2); + set_hash(in[2].value.update.new_hash, 3); + set_hash(in[2].value.update.old_hash, 4); + + check(!reftable_log_record_is_deletion(&in[0])); + check(reftable_log_record_is_deletion(&in[1])); + check(!reftable_log_record_is_deletion(&in[2])); + + for (size_t i = 0; i < ARRAY_SIZE(in); i++) { + struct reftable_record rec = { .type = BLOCK_TYPE_LOG }; + struct strbuf key = STRBUF_INIT; + uint8_t buffer[1024] = { 0 }; + struct string_view dest = { + .buf = buffer, + .len = sizeof(buffer), + }; + /* populate out, to check for leaks. */ + struct reftable_record out = { + .type = BLOCK_TYPE_LOG, + .u.log = { + .refname = xstrdup("old name"), + .value_type = REFTABLE_LOG_UPDATE, + .value = { + .update = { + .name = xstrdup("old name"), + .email = xstrdup("old@email"), + .message = xstrdup("old message"), + }, + }, + }, + }; + int n, m, valtype; + + rec.u.log = in[i]; + + t_copy(&rec); + + reftable_record_key(&rec, &key); + + n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ); + check_int(n, >=, 0); + valtype = reftable_record_val_type(&rec); + m = reftable_record_decode(&out, key, valtype, dest, + GIT_SHA1_RAWSZ, &scratch); + check_int(n, ==, m); + + check(reftable_log_record_equal(&in[i], &out.u.log, + GIT_SHA1_RAWSZ)); + reftable_log_record_release(&in[i]); + strbuf_release(&key); + reftable_record_release(&out); + } + + strbuf_release(&scratch); +} + +static void t_key_roundtrip(void) +{ + uint8_t buffer[1024] = { 0 }; + struct string_view dest = { + .buf = buffer, + .len = sizeof(buffer), + }; + struct strbuf last_key = STRBUF_INIT; + struct strbuf key = STRBUF_INIT; + struct strbuf roundtrip = STRBUF_INIT; + int restart; + uint8_t extra; + int n, m; + uint8_t rt_extra; + + strbuf_addstr(&last_key, "refs/heads/master"); + strbuf_addstr(&key, "refs/tags/bla"); + extra = 6; + n = reftable_encode_key(&restart, dest, last_key, key, extra); + check(!restart); + check_int(n, >, 0); + + strbuf_addstr(&roundtrip, "refs/heads/master"); + m = reftable_decode_key(&roundtrip, &rt_extra, dest); + check_int(n, ==, m); + check(!strbuf_cmp(&key, &roundtrip)); + check_int(rt_extra, ==, extra); + + strbuf_release(&last_key); + strbuf_release(&key); + strbuf_release(&roundtrip); +} + +static void t_reftable_obj_record_comparison(void) +{ + + uint8_t id_bytes[] = { 0, 1, 2, 3, 4, 5, 6 }; + uint64_t offsets[] = { 0, 16, 32, 48, 64, 80, 96, 112}; + struct reftable_record in[3] = { + { + .type = BLOCK_TYPE_OBJ, + .u.obj.hash_prefix = id_bytes, + .u.obj.hash_prefix_len = 7, + .u.obj.offsets = offsets, + .u.obj.offset_len = 8, + }, + { + .type = BLOCK_TYPE_OBJ, + .u.obj.hash_prefix = id_bytes, + .u.obj.hash_prefix_len = 7, + .u.obj.offsets = offsets, + .u.obj.offset_len = 5, + }, + { + .type = BLOCK_TYPE_OBJ, + .u.obj.hash_prefix = id_bytes, + .u.obj.hash_prefix_len = 5, + }, + }; + + check(!reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); + + check(!reftable_record_equal(&in[1], &in[2], GIT_SHA1_RAWSZ)); + check_int(reftable_record_cmp(&in[1], &in[2]), >, 0); + + in[1].u.obj.offset_len = in[0].u.obj.offset_len; + check(reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); +} + +static void t_reftable_obj_record_roundtrip(void) +{ + uint8_t testHash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 4, 0 }; + uint64_t till9[] = { 1, 2, 3, 4, 500, 600, 700, 800, 9000 }; + struct reftable_obj_record recs[3] = { + { + .hash_prefix = testHash1, + .hash_prefix_len = 5, + .offsets = till9, + .offset_len = 3, + }, + { + .hash_prefix = testHash1, + .hash_prefix_len = 5, + .offsets = till9, + .offset_len = 9, + }, + { + .hash_prefix = testHash1, + .hash_prefix_len = 5, + }, + }; + struct strbuf scratch = STRBUF_INIT; + + for (size_t i = 0; i < ARRAY_SIZE(recs); i++) { + uint8_t buffer[1024] = { 0 }; + struct string_view dest = { + .buf = buffer, + .len = sizeof(buffer), + }; + struct reftable_record in = { + .type = BLOCK_TYPE_OBJ, + .u = { + .obj = recs[i], + }, + }; + struct strbuf key = STRBUF_INIT; + struct reftable_record out = { .type = BLOCK_TYPE_OBJ }; + int n, m; + uint8_t extra; + + check(!reftable_record_is_deletion(&in)); + t_copy(&in); + reftable_record_key(&in, &key); + n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); + check_int(n, >, 0); + extra = reftable_record_val_type(&in); + m = reftable_record_decode(&out, key, extra, dest, + GIT_SHA1_RAWSZ, &scratch); + check_int(n, ==, m); + + check(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ)); + strbuf_release(&key); + reftable_record_release(&out); + } + + strbuf_release(&scratch); +} + +static void t_reftable_index_record_comparison(void) +{ + struct reftable_record in[3] = { + { + .type = BLOCK_TYPE_INDEX, + .u.idx.offset = 22, + .u.idx.last_key = STRBUF_INIT, + }, + { + .type = BLOCK_TYPE_INDEX, + .u.idx.offset = 32, + .u.idx.last_key = STRBUF_INIT, + }, + { + .type = BLOCK_TYPE_INDEX, + .u.idx.offset = 32, + .u.idx.last_key = STRBUF_INIT, + }, + }; + strbuf_addstr(&in[0].u.idx.last_key, "refs/heads/master"); + strbuf_addstr(&in[1].u.idx.last_key, "refs/heads/master"); + strbuf_addstr(&in[2].u.idx.last_key, "refs/heads/branch"); + + check(!reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); + + check(!reftable_record_equal(&in[1], &in[2], GIT_SHA1_RAWSZ)); + check_int(reftable_record_cmp(&in[1], &in[2]), >, 0); + + in[1].u.idx.offset = in[0].u.idx.offset; + check(reftable_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ)); + check(!reftable_record_cmp(&in[0], &in[1])); + + for (size_t i = 0; i < ARRAY_SIZE(in); i++) + reftable_record_release(&in[i]); +} + +static void t_reftable_index_record_roundtrip(void) +{ + struct reftable_record in = { + .type = BLOCK_TYPE_INDEX, + .u.idx = { + .offset = 42, + .last_key = STRBUF_INIT, + }, + }; + uint8_t buffer[1024] = { 0 }; + struct string_view dest = { + .buf = buffer, + .len = sizeof(buffer), + }; + struct strbuf scratch = STRBUF_INIT; + struct strbuf key = STRBUF_INIT; + struct reftable_record out = { + .type = BLOCK_TYPE_INDEX, + .u.idx = { .last_key = STRBUF_INIT }, + }; + int n, m; + uint8_t extra; + + strbuf_addstr(&in.u.idx.last_key, "refs/heads/master"); + reftable_record_key(&in, &key); + t_copy(&in); + + check(!reftable_record_is_deletion(&in)); + check(!strbuf_cmp(&key, &in.u.idx.last_key)); + n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ); + check_int(n, >, 0); + + extra = reftable_record_val_type(&in); + m = reftable_record_decode(&out, key, extra, dest, GIT_SHA1_RAWSZ, + &scratch); + check_int(m, ==, n); + + check(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ)); + + reftable_record_release(&out); + strbuf_release(&key); + strbuf_release(&scratch); + strbuf_release(&in.u.idx.last_key); +} + +int cmd_main(int argc, const char *argv[]) +{ + TEST(t_reftable_ref_record_comparison(), "comparison operations work on ref record"); + TEST(t_reftable_log_record_comparison(), "comparison operations work on log record"); + TEST(t_reftable_index_record_comparison(), "comparison operations work on index record"); + TEST(t_reftable_obj_record_comparison(), "comparison operations work on obj record"); + TEST(t_reftable_ref_record_compare_name(), "reftable_ref_record_compare_name works"); + TEST(t_reftable_log_record_compare_key(), "reftable_log_record_compare_key works"); + TEST(t_reftable_log_record_roundtrip(), "record operations work on log record"); + TEST(t_reftable_ref_record_roundtrip(), "record operations work on ref record"); + TEST(t_varint_roundtrip(), "put_var_int and get_var_int work"); + TEST(t_key_roundtrip(), "reftable_encode_key and reftable_decode_key work"); + TEST(t_reftable_obj_record_roundtrip(), "record operations work on obj record"); + TEST(t_reftable_index_record_roundtrip(), "record operations work on index record"); + + return test_done(); +} diff --git a/t/unit-tests/t-strvec.c b/t/unit-tests/t-strvec.c index d4615ab06d..fa1a041469 100644 --- a/t/unit-tests/t-strvec.c +++ b/t/unit-tests/t-strvec.c @@ -3,38 +3,21 @@ #include "strvec.h" #define check_strvec(vec, ...) \ - check_strvec_loc(TEST_LOCATION(), vec, __VA_ARGS__) -LAST_ARG_MUST_BE_NULL -static void check_strvec_loc(const char *loc, struct strvec *vec, ...) -{ - va_list ap; - size_t nr = 0; - - va_start(ap, vec); - while (1) { - const char *str = va_arg(ap, const char *); - if (!str) - break; - - if (!check_uint(vec->nr, >, nr) || - !check_uint(vec->alloc, >, nr) || - !check_str(vec->v[nr], str)) { - struct strbuf msg = STRBUF_INIT; - strbuf_addf(&msg, "strvec index %"PRIuMAX, (uintmax_t) nr); - test_assert(loc, msg.buf, 0); - strbuf_release(&msg); - va_end(ap); - return; - } - - nr++; - } - va_end(ap); - - check_uint(vec->nr, ==, nr); - check_uint(vec->alloc, >=, nr); - check_pointer_eq(vec->v[nr], NULL); -} + do { \ + const char *expect[] = { __VA_ARGS__ }; \ + if (check_uint(ARRAY_SIZE(expect), >, 0) && \ + check_pointer_eq(expect[ARRAY_SIZE(expect) - 1], NULL) && \ + check_uint((vec)->nr, ==, ARRAY_SIZE(expect) - 1) && \ + check_uint((vec)->nr, <=, (vec)->alloc)) { \ + for (size_t i = 0; i < ARRAY_SIZE(expect); i++) { \ + if (!check_str((vec)->v[i], expect[i])) { \ + test_msg(" i: %"PRIuMAX, \ + (uintmax_t)i); \ + break; \ + } \ + } \ + } \ + } while (0) static void t_static_init(void) { diff --git a/t/unit-tests/test-lib.h b/t/unit-tests/test-lib.h index 2de6d715d5..c59f646fd9 100644 --- a/t/unit-tests/test-lib.h +++ b/t/unit-tests/test-lib.h @@ -76,8 +76,9 @@ int test_assert(const char *location, const char *check, int ok); int check_bool_loc(const char *loc, const char *check, int ok); /* - * Compare two integers. Prints a message with the two values if the - * comparison fails. NB this is not thread safe. + * Compare the equality of two pointers of same type. Prints a message + * with the two values if the equality fails. NB this is not thread + * safe. */ #define check_pointer_eq(a, b) \ (test__tmp[0].p = (a), test__tmp[1].p = (b), \ |